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

Diff for /src/usr.bin/ssh/sshconnect2.c between version 1.338 and 1.339

version 1.338, 2020/12/20 23:40:19 version 1.339, 2020/12/22 00:15:23
Line 132 
Line 132 
                 load_hostkeys(hostkeys, hostname,                  load_hostkeys(hostkeys, hostname,
                     options.system_hostfiles[i], 0);                      options.system_hostfiles[i], 0);
         }          }
           if (options.known_hosts_command != NULL) {
                   load_hostkeys_command(hostkeys, options.known_hosts_command,
                       "ORDER", cinfo, NULL, host);
           }
         /*          /*
          * If a plain public key exists that matches the type of the best           * If a plain public key exists that matches the type of the best
          * preference HostkeyAlgorithms, then use the whole list as is.           * preference HostkeyAlgorithms, then use the whole list as is.
Line 193 
Line 197 
             (*first == '\0' || *last == '\0') ? "" : ",", last);              (*first == '\0' || *last == '\0') ? "" : ",", last);
         if (*first != '\0')          if (*first != '\0')
                 debug3_f("prefer hostkeyalgs: %s", first);                  debug3_f("prefer hostkeyalgs: %s", first);
           else
                   debug3_f("no algorithms matched; accept original");
  out:   out:
         free(best);          free(best);
         free(first);          free(first);
Legend:
Removed from v.1.338  
changed lines
  Added in v.1.339