diff options
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 7d2141355..a97509c28 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.28 2011/05/11 04:47:06 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -451,13 +451,7 @@ user_key_allowed(struct passwd *pw, Key *key) | |||
451 | file = authorized_keys_file(pw); | 451 | file = authorized_keys_file(pw); |
452 | success = user_key_allowed2(pw, key, file); | 452 | success = user_key_allowed2(pw, key, file); |
453 | xfree(file); | 453 | xfree(file); |
454 | if (success) | ||
455 | return success; | ||
456 | 454 | ||
457 | /* try suffix "2" for backward compat, too */ | ||
458 | file = authorized_keys_file2(pw); | ||
459 | success = user_key_allowed2(pw, key, file); | ||
460 | xfree(file); | ||
461 | return success; | 455 | return success; |
462 | } | 456 | } |
463 | 457 | ||