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

Diff for /src/usr.bin/ssh/clientloop.c between version 1.336 and 1.337

version 1.336, 2020/01/29 07:51:30 version 1.337, 2020/01/29 08:17:49
Line 1874 
Line 1874 
 }  }
   
 static void  static void
 hostkey_change_preamble(void)  hostkey_change_preamble(LogLevel loglevel)
 {  {
         LogLevel loglevel = options.update_hostkeys == SSH_UPDATE_HOSTKEYS_ASK ?  
             SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_VERBOSE;  
   
         do_log2(loglevel, "The server has updated its host keys.");          do_log2(loglevel, "The server has updated its host keys.");
         do_log2(loglevel, "These changes were verified by the server's "          do_log2(loglevel, "These changes were verified by the server's "
             "existing trusted key.");              "existing trusted key.");
Line 1901 
Line 1898 
                     options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL)                      options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL)
                         fatal("%s: sshkey_fingerprint failed", __func__);                          fatal("%s: sshkey_fingerprint failed", __func__);
                 if (first && asking)                  if (first && asking)
                         hostkey_change_preamble();                          hostkey_change_preamble(loglevel);
                 do_log2(loglevel, "Learned new hostkey: %s %s",                  do_log2(loglevel, "Learned new hostkey: %s %s",
                     sshkey_type(ctx->keys[i]), fp);                      sshkey_type(ctx->keys[i]), fp);
                 first = 0;                  first = 0;
Line 1912 
Line 1909 
                     options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL)                      options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL)
                         fatal("%s: sshkey_fingerprint failed", __func__);                          fatal("%s: sshkey_fingerprint failed", __func__);
                 if (first && asking)                  if (first && asking)
                         hostkey_change_preamble();                          hostkey_change_preamble(loglevel);
                 do_log2(loglevel, "Deprecating obsolete hostkey: %s %s",                  do_log2(loglevel, "Deprecating obsolete hostkey: %s %s",
                     sshkey_type(ctx->old_keys[i]), fp);                      sshkey_type(ctx->old_keys[i]), fp);
                 first = 0;                  first = 0;
Legend:
Removed from v.1.336  
changed lines
  Added in v.1.337