[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.420.2.2 and 1.421

version 1.420.2.2, 2016/01/14 14:48:18 version 1.421, 2015/09/04 04:56:09
Line 1150 
Line 1150 
          * have yet resolved the hostname. Do so now.           * have yet resolved the hostname. Do so now.
          */           */
         if (addrs == NULL && options.proxy_command == NULL) {          if (addrs == NULL && options.proxy_command == NULL) {
                   debug2("resolving \"%s\" port %d", host, options.port);
                 if ((addrs = resolve_host(host, options.port, 1,                  if ((addrs = resolve_host(host, options.port, 1,
                     cname, sizeof(cname))) == NULL)                      cname, sizeof(cname))) == NULL)
                         cleanup_exit(255); /* resolve_host logs the error */                          cleanup_exit(255); /* resolve_host logs the error */
Line 1554 
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 1625 
Line 1625 
         display = getenv("DISPLAY");          display = getenv("DISPLAY");
         if (display == NULL && options.forward_x11)          if (display == NULL && options.forward_x11)
                 debug("X11 forwarding requested but DISPLAY not set");                  debug("X11 forwarding requested but DISPLAY not set");
         if (options.forward_x11 && client_x11_get_proto(display,          if (options.forward_x11 && display != NULL) {
             options.xauth_location, options.forward_x11_trusted,                  char *proto, *data;
             options.forward_x11_timeout, &proto, &data) == 0) {                  /* Get reasonable local authentication information. */
                   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 1717 
Line 1721 
         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 */
Line 1725 
Line 1728 
         display = getenv("DISPLAY");          display = getenv("DISPLAY");
         if (display == NULL && options.forward_x11)          if (display == NULL && options.forward_x11)
                 debug("X11 forwarding requested but DISPLAY not set");                  debug("X11 forwarding requested but DISPLAY not set");
         if (options.forward_x11 && client_x11_get_proto(display,          if (options.forward_x11 && display != NULL) {
             options.xauth_location, options.forward_x11_trusted,                  char *proto, *data;
             options.forward_x11_timeout, &proto, &data) == 0) {                  /* Get reasonable local authentication information. */
                   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 1876 
Line 1882 
                 } 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.420.2.2  
changed lines
  Added in v.1.421