[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.20 and 1.21

version 1.20, 2010/06/25 07:14:46 version 1.21, 2010/06/25 23:15:36
Line 1089 
Line 1089 
         display = getenv("DISPLAY");          display = getenv("DISPLAY");
         if (cctx->want_x_fwd && options.forward_x11 && display != NULL) {          if (cctx->want_x_fwd && options.forward_x11 && display != NULL) {
                 char *proto, *data;                  char *proto, *data;
   
                 /* Get reasonable local authentication information. */                  /* Get reasonable local authentication information. */
                 client_x11_get_proto(display, options.xauth_location,                  client_x11_get_proto(display, options.xauth_location,
                     options.forward_x11_trusted, &proto, &data);                      options.forward_x11_trusted, options.forward_x11_timeout,
                       &proto, &data);
                 /* Request forwarding with authentication spoofing. */                  /* Request forwarding with authentication spoofing. */
                 debug("Requesting X11 forwarding with authentication spoofing.");                  debug("Requesting X11 forwarding with authentication "
                       "spoofing.");
                 x11_request_forwarding_with_spoofing(id, display, proto, data);                  x11_request_forwarding_with_spoofing(id, display, proto, data);
                 /* XXX wait for reply */                  /* XXX wait for reply */
         }          }
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21