- 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@

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 @@
-/* $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;
 }