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

Diff for /src/usr.bin/ssh/ssh.c between version 1.532 and 1.533

version 1.532, 2020/07/17 03:23:10 version 1.533, 2020/07/17 03:43:42
Line 160 
Line 160 
 /* Various strings used to to percent_expand() arguments */  /* Various strings used to to percent_expand() arguments */
 static char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];  static char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];
 static char uidstr[32], *host_arg, *conn_hash_hex;  static char uidstr[32], *host_arg, *conn_hash_hex;
   static const char *keyalias;
   
 /* socket address the host resolves to */  /* socket address the host resolves to */
 struct sockaddr_storage hostaddr;  struct sockaddr_storage hostaddr;
Line 219 
Line 220 
     "C", conn_hash_hex, \      "C", conn_hash_hex, \
     "L", shorthost, \      "L", shorthost, \
     "i", uidstr, \      "i", uidstr, \
       "k", keyalias, \
     "l", thishost, \      "l", thishost, \
     "n", host_arg, \      "n", host_arg, \
     "p", portstr      "p", portstr
Line 1359 
Line 1361 
         snprintf(portstr, sizeof(portstr), "%d", options.port);          snprintf(portstr, sizeof(portstr), "%d", options.port);
         snprintf(uidstr, sizeof(uidstr), "%llu",          snprintf(uidstr, sizeof(uidstr), "%llu",
             (unsigned long long)pw->pw_uid);              (unsigned long long)pw->pw_uid);
           keyalias = options.host_key_alias ? options.host_key_alias : host_arg;
   
         conn_hash_hex = ssh_connection_hash(thishost, host, portstr,          conn_hash_hex = ssh_connection_hash(thishost, host, portstr,
             options.user);              options.user);
Legend:
Removed from v.1.532  
changed lines
  Added in v.1.533