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

Diff for /src/usr.bin/ssh/readconf.c between version 1.323 and 1.324

version 1.323, 2020/01/25 00:22:31 version 1.324, 2020/01/30 22:19:32
Line 2094 
Line 2094 
                 options->system_hostfiles[options->num_system_hostfiles++] =                  options->system_hostfiles[options->num_system_hostfiles++] =
                     xstrdup(_PATH_SSH_SYSTEM_HOSTFILE2);                      xstrdup(_PATH_SSH_SYSTEM_HOSTFILE2);
         }          }
           if (options->update_hostkeys == -1) {
                   /*
                    * Enable UpdateHostKeys non-interactively if the user has
                    * not overridden the default known_hosts selection, or has
                    * overridden it with the default. Otherwise, prompt.
                    */
                   if (options->num_user_hostfiles == 0 ||
                       (options->num_user_hostfiles == 1 && strcmp(options->
                       user_hostfiles[0], _PATH_SSH_USER_HOSTFILE) == 0))
                           options->update_hostkeys = SSH_UPDATE_HOSTKEYS_YES;
                   else
                           options->update_hostkeys = SSH_UPDATE_HOSTKEYS_ASK;
           }
         if (options->num_user_hostfiles == 0) {          if (options->num_user_hostfiles == 0) {
                 options->user_hostfiles[options->num_user_hostfiles++] =                  options->user_hostfiles[options->num_user_hostfiles++] =
                     xstrdup(_PATH_SSH_USER_HOSTFILE);                      xstrdup(_PATH_SSH_USER_HOSTFILE);
Line 2154 
Line 2167 
                 options->canonicalize_hostname = SSH_CANONICALISE_NO;                  options->canonicalize_hostname = SSH_CANONICALISE_NO;
         if (options->fingerprint_hash == -1)          if (options->fingerprint_hash == -1)
                 options->fingerprint_hash = SSH_FP_HASH_DEFAULT;                  options->fingerprint_hash = SSH_FP_HASH_DEFAULT;
         if (options->update_hostkeys == -1)  
                 options->update_hostkeys = SSH_UPDATE_HOSTKEYS_ASK;  
         if (options->sk_provider == NULL)          if (options->sk_provider == NULL)
                 options->sk_provider = xstrdup("internal");                  options->sk_provider = xstrdup("internal");
   

Legend:
Removed from v.1.323  
changed lines
  Added in v.1.324