[BACK]Return to mux.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/mux.c between version 1.57 and 1.58

version 1.57, 2015/12/26 07:46:03 version 1.58, 2016/01/13 23:04:47
Line 1341 
Line 1341 
                 char *proto, *data;                  char *proto, *data;
   
                 /* Get reasonable local authentication information. */                  /* Get reasonable local authentication information. */
                 client_x11_get_proto(display, options.xauth_location,                  if (client_x11_get_proto(display, options.xauth_location,
                     options.forward_x11_trusted, options.forward_x11_timeout,                      options.forward_x11_trusted, options.forward_x11_timeout,
                     &proto, &data);                      &proto, &data) == 0) {
                 /* Request forwarding with authentication spoofing. */                          /* Request forwarding with authentication spoofing. */
                 debug("Requesting X11 forwarding with authentication "                          debug("Requesting X11 forwarding with authentication "
                     "spoofing.");                              "spoofing.");
                 x11_request_forwarding_with_spoofing(id, display, proto,                          x11_request_forwarding_with_spoofing(id, display, proto,
                     data, 1);                              data, 1);
                 client_expect_confirm(id, "X11 forwarding", CONFIRM_WARN);                          /* XXX exit_on_forward_failure */
                 /* XXX exit_on_forward_failure */                          client_expect_confirm(id, "X11 forwarding",
                               CONFIRM_WARN);
                   }
         }          }
   
         if (cctx->want_agent_fwd && options.forward_agent) {          if (cctx->want_agent_fwd && options.forward_agent) {
Legend:
Removed from v.1.57  
changed lines
  Added in v.1.58