[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.389 and 1.390

version 1.389, 2013/10/23 03:05:19 version 1.390, 2013/10/24 08:19:36
Line 881 
Line 881 
         /*          /*
          * If canonicalization not requested, or if it failed then try to           * If canonicalization not requested, or if it failed then try to
          * resolve the bare hostname name using the system resolver's usual           * resolve the bare hostname name using the system resolver's usual
          * search rules.           * search rules. Skip the lookup if a ProxyCommand is being used
            * unless the user has specifically requested canonicalisation.
          */           */
         if (addrs == NULL) {          if (addrs == NULL && (options.proxy_command == NULL ||
               options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) {
                 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 */
Legend:
Removed from v.1.389  
changed lines
  Added in v.1.390