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

Diff for /src/usr.bin/ssh/ssh.c between version 1.416 and 1.416.2.2

version 1.416, 2015/03/03 06:48:58 version 1.416.2.2, 2016/01/14 14:48:36
Line 1555 
Line 1555 
         struct winsize ws;          struct winsize ws;
         char *cp;          char *cp;
         const char *display;          const char *display;
           char *proto = NULL, *data = NULL;
   
         /* Enable compression if requested. */          /* Enable compression if requested. */
         if (options.compression) {          if (options.compression) {
Line 1623 
Line 1624 
         }          }
         /* Request X11 forwarding if enabled and DISPLAY is set. */          /* Request X11 forwarding if enabled and DISPLAY is set. */
         display = getenv("DISPLAY");          display = getenv("DISPLAY");
         if (options.forward_x11 && display != NULL) {          if (options.forward_x11 && client_x11_get_proto(display,
                 char *proto, *data;              options.xauth_location, options.forward_x11_trusted,
                 /* Get reasonable local authentication information. */              options.forward_x11_timeout, &proto, &data) == 0) {
                 client_x11_get_proto(display, options.xauth_location,  
                     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 "                  debug("Requesting X11 forwarding with authentication "
                     "spoofing.");                      "spoofing.");
Line 1719 
Line 1716 
         extern char **environ;          extern char **environ;
         const char *display;          const char *display;
         int interactive = tty_flag;          int interactive = tty_flag;
           char *proto = NULL, *data = NULL;
   
         if (!success)          if (!success)
                 return; /* No need for error message, channels code sens one */                  return; /* No need for error message, channels code sens one */
   
         display = getenv("DISPLAY");          display = getenv("DISPLAY");
         if (options.forward_x11 && display != NULL) {          if (options.forward_x11 && client_x11_get_proto(display,
                 char *proto, *data;              options.xauth_location, options.forward_x11_trusted,
                 /* Get reasonable local authentication information. */              options.forward_x11_timeout, &proto, &data) == 0) {
                 client_x11_get_proto(display, options.xauth_location,  
                     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 "                  debug("Requesting X11 forwarding with authentication "
                     "spoofing.");                      "spoofing.");
Line 1878 
Line 1873 
                 } else                  } else
                         fork_postauth();                          fork_postauth();
         }          }
   
         if (options.use_roaming)  
                 request_roaming();  
   
         return client_loop(tty_flag, tty_flag ?          return client_loop(tty_flag, tty_flag ?
             options.escape_char : SSH_ESCAPECHAR_NONE, id);              options.escape_char : SSH_ESCAPECHAR_NONE, id);
Legend:
Removed from v.1.416  
changed lines
  Added in v.1.416.2.2