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

Diff for /src/usr.bin/ssh/sshconnect.c between version 1.205 and 1.206

version 1.205, 2008/06/12 00:03:49 version 1.206, 2008/06/12 00:13:55
Line 597 
Line 597 
         char msg[1024];          char msg[1024];
         int len, host_line, ip_line;          int len, host_line, ip_line;
         const char *host_file = NULL, *ip_file = NULL;          const char *host_file = NULL, *ip_file = NULL;
           int display_randomart;
   
         /*          /*
          * Force accepting of the host key for loopback/localhost. The           * Force accepting of the host key for loopback/localhost. The
Line 639 
Line 640 
         } else {          } else {
                 ip = xstrdup("<no hostip for proxy command>");                  ip = xstrdup("<no hostip for proxy command>");
         }          }
   
         /*          /*
            * check_host_ip may be set to zero in the next step, so if it
            * conveys a request to display the random art, save it away.
            */
           display_randomart = (options.check_host_ip == SSHCTL_CHECKHOSTIP_FPR);
   
           /*
          * Turn off check_host_ip if the connection is to localhost, via proxy           * Turn off check_host_ip if the connection is to localhost, via proxy
          * command or if we don't have a hostname to compare with           * command or if we don't have a hostname to compare with
          */           */
Line 723 
Line 731 
                                 logit("Warning: Permanently added the %s host "                                  logit("Warning: Permanently added the %s host "
                                     "key for IP address '%.128s' to the list "                                      "key for IP address '%.128s' to the list "
                                     "of known hosts.", type, ip);                                      "of known hosts.", type, ip);
                 } else if (options.check_host_ip == SSHCTL_CHECKHOSTIP_FPR) {                  } else if (display_randomart) {
                         fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);                          fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX);
                         ra = key_fingerprint(host_key, SSH_FP_MD5,                          ra = key_fingerprint(host_key, SSH_FP_MD5,
                             SSH_FP_RANDOMART);                              SSH_FP_RANDOMART);
Legend:
Removed from v.1.205  
changed lines
  Added in v.1.206