diff options
| author | Damien Miller <djm@mindrot.org> | 2011-05-15 08:51:05 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-05-15 08:51:05 +1000 |
| commit | 7c1b2c4ea8a5d06908dda3f8e406b902b81fe905 (patch) | |
| tree | d4feec6013425aa759cb0e0d4863de23c8cc2997 /auth2-pubkey.c | |
| parent | 3219824f2d8b0ea1711818745b046931ffcd3918 (diff) | |
- djm@cvs.openbsd.org 2011/05/11 04:47:06
[auth.c auth.h auth2-pubkey.c pathnames.h servconf.c servconf.h]
remove support for authorized_keys2; it is a relic from the early days
of protocol v.2 support and has been undocumented for many years;
ok markus@
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 7d214135..a97509c2 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkey.c,v 1.27 2010/11/20 05:12:38 deraadt Exp $ */ +/* $OpenBSD: auth2-pubkey.c,v 1.28 2011/05/11 04:47:06 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -451,13 +451,7 @@ user_key_allowed(struct passwd *pw, Key *key) file = authorized_keys_file(pw); success = user_key_allowed2(pw, key, file); xfree(file); - if (success) - return success; - /* try suffix "2" for backward compat, too */ - file = authorized_keys_file2(pw); - success = user_key_allowed2(pw, key, file); - xfree(file); return success; } |