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

Diff for /src/usr.bin/ssh/auth2-pubkey.c between version 1.77 and 1.78

version 1.77, 2018/03/03 03:15:51 version 1.78, 2018/06/01 03:33:53
Line 384 
Line 384 
         pid_t pid;          pid_t pid;
         char *tmp, *username = NULL, *command = NULL, **av = NULL;          char *tmp, *username = NULL, *command = NULL, **av = NULL;
         char *ca_fp = NULL, *key_fp = NULL, *catext = NULL, *keytext = NULL;          char *ca_fp = NULL, *key_fp = NULL, *catext = NULL, *keytext = NULL;
         char serial_s[16];          char serial_s[16], uidstr[32];
         void (*osigchld)(int);          void (*osigchld)(int);
   
         if (authoptsp != NULL)          if (authoptsp != NULL)
Line 444 
Line 444 
         }          }
         snprintf(serial_s, sizeof(serial_s), "%llu",          snprintf(serial_s, sizeof(serial_s), "%llu",
             (unsigned long long)cert->serial);              (unsigned long long)cert->serial);
           snprintf(uidstr, sizeof(uidstr), "%llu",
               (unsigned long long)user_pw->pw_uid);
         for (i = 1; i < ac; i++) {          for (i = 1; i < ac; i++) {
                 tmp = percent_expand(av[i],                  tmp = percent_expand(av[i],
                       "U", uidstr,
                     "u", user_pw->pw_name,                      "u", user_pw->pw_name,
                     "h", user_pw->pw_dir,                      "h", user_pw->pw_dir,
                     "t", sshkey_ssh_name(key),                      "t", sshkey_ssh_name(key),
Line 849 
Line 852 
         int i, uid_swapped = 0, ac = 0;          int i, uid_swapped = 0, ac = 0;
         pid_t pid;          pid_t pid;
         char *username = NULL, *key_fp = NULL, *keytext = NULL;          char *username = NULL, *key_fp = NULL, *keytext = NULL;
         char *tmp, *command = NULL, **av = NULL;          char uidstr[32], *tmp, *command = NULL, **av = NULL;
         void (*osigchld)(int);          void (*osigchld)(int);
   
         if (authoptsp != NULL)          if (authoptsp != NULL)
Line 899 
Line 902 
                     command);                      command);
                 goto out;                  goto out;
         }          }
           snprintf(uidstr, sizeof(uidstr), "%llu",
               (unsigned long long)user_pw->pw_uid);
         for (i = 1; i < ac; i++) {          for (i = 1; i < ac; i++) {
                 tmp = percent_expand(av[i],                  tmp = percent_expand(av[i],
                       "U", uidstr,
                     "u", user_pw->pw_name,                      "u", user_pw->pw_name,
                     "h", user_pw->pw_dir,                      "h", user_pw->pw_dir,
                     "t", sshkey_ssh_name(key),                      "t", sshkey_ssh_name(key),

Legend:
Removed from v.1.77  
changed lines
  Added in v.1.78