[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.402 and 1.403

version 1.402, 2014/04/29 18:01:49 version 1.403, 2014/06/24 02:19:48
Line 902 
Line 902 
         if (addrs == NULL && options.num_permitted_cnames != 0 &&          if (addrs == NULL && options.num_permitted_cnames != 0 &&
             (option_clear_or_none(options.proxy_command) ||              (option_clear_or_none(options.proxy_command) ||
             options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) {              options.canonicalize_hostname == SSH_CANONICALISE_ALWAYS)) {
                 if ((addrs = resolve_host(host, options.port, 1,                  if ((addrs = resolve_host(host, options.port,
                     cname, sizeof(cname))) == NULL)                      option_clear_or_none(options.proxy_command),
                         cleanup_exit(255); /* resolve_host logs the error */                      cname, sizeof(cname))) == NULL) {
                 check_follow_cname(&host, cname);                          /* Don't fatal proxied host names not in the DNS */
                           if (option_clear_or_none(options.proxy_command))
                                   cleanup_exit(255); /* logged in resolve_host */
                   } else
                           check_follow_cname(&host, cname);
         }          }
   
         /*          /*
Legend:
Removed from v.1.402  
changed lines
  Added in v.1.403