[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.359 and 1.360

version 1.359, 2022/10/24 22:43:36 version 1.360, 2022/11/03 21:59:20
Line 923 
Line 923 
         }          }
   
         /*          /*
            * Don't ever try to write an invalid name to a known hosts file.
            * Note: do this before get_hostfile_hostname_ipaddr() to catch
            * '[' or ']' in the name before they are added.
            */
           if (strcspn(hostname, "@?*#[]|'\'\"\\") != strlen(hostname)) {
                   debug_f("invalid hostname \"%s\"; will not record: %s",
                       hostname, fail_reason);
                   readonly = RDONLY;
           }
   
           /*
          * Prepare the hostname and address strings used for hostkey lookup.           * Prepare the hostname and address strings used for hostkey lookup.
          * In some cases, these will have a port number appended.           * In some cases, these will have a port number appended.
          */           */
Line 979 
Line 990 
         if (!readonly && (num_user_hostfiles == 0 ||          if (!readonly && (num_user_hostfiles == 0 ||
             (host_found != NULL && host_found->note != 0)))              (host_found != NULL && host_found->note != 0)))
                 readonly = RDONLY;                  readonly = RDONLY;
   
         /* Don't ever try to write an invalid name to a known hosts file */  
         if (!valid_domain(hostname, 0, &fail_reason)) {  
                 debug_f("invalid hostname \"%s\"; will not record: %s",  
                     hostname, fail_reason);  
                 readonly = RDONLY;  
         }  
   
         /*          /*
          * Also perform check for the ip address, skip the check if we are           * Also perform check for the ip address, skip the check if we are
Legend:
Removed from v.1.359  
changed lines
  Added in v.1.360