[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.28 and 1.29

version 1.28, 2011/05/11 04:47:06 version 1.29, 2011/05/23 03:30:07
Line 435 
Line 435 
 int  int
 user_key_allowed(struct passwd *pw, Key *key)  user_key_allowed(struct passwd *pw, Key *key)
 {  {
         int success;          u_int success, i;
         char *file;          char *file;
   
         if (auth_key_is_revoked(key))          if (auth_key_is_revoked(key))
Line 447 
Line 447 
         if (success)          if (success)
                 return success;                  return success;
   
         file = authorized_keys_file(pw);          for (i = 0; !success && i < options.num_authkeys_files; i++) {
         success = user_key_allowed2(pw, key, file);                  file = expand_authorized_keys(
         xfree(file);                      options.authorized_keys_files[i], pw);
                   success = user_key_allowed2(pw, key, file);
                   xfree(file);
           }
   
         return success;          return success;
 }  }

Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29