diff options
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index dbf0d0d22..a1d31e930 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-pubkey.c,v 1.27 2010/11/20 05:12:38 deraadt Exp $ */ | 1 | /* $OpenBSD: auth2-pubkey.c,v 1.29 2011/05/23 03:30:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -440,7 +440,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key) | |||
440 | int | 440 | int |
441 | user_key_allowed(struct passwd *pw, Key *key) | 441 | user_key_allowed(struct passwd *pw, Key *key) |
442 | { | 442 | { |
443 | int success; | 443 | u_int success, i; |
444 | char *file; | 444 | char *file; |
445 | 445 | ||
446 | if (auth_key_is_revoked(key, 0)) | 446 | if (auth_key_is_revoked(key, 0)) |
@@ -453,16 +453,13 @@ user_key_allowed(struct passwd *pw, Key *key) | |||
453 | if (success) | 453 | if (success) |
454 | return success; | 454 | return success; |
455 | 455 | ||
456 | file = authorized_keys_file(pw); | 456 | for (i = 0; !success && i < options.num_authkeys_files; i++) { |
457 | success = user_key_allowed2(pw, key, file); | 457 | file = expand_authorized_keys( |
458 | xfree(file); | 458 | options.authorized_keys_files[i], pw); |
459 | if (success) | 459 | success = user_key_allowed2(pw, key, file); |
460 | return success; | 460 | xfree(file); |
461 | } | ||
461 | 462 | ||
462 | /* try suffix "2" for backward compat, too */ | ||
463 | file = authorized_keys_file2(pw); | ||
464 | success = user_key_allowed2(pw, key, file); | ||
465 | xfree(file); | ||
466 | return success; | 463 | return success; |
467 | } | 464 | } |
468 | 465 | ||