2 files changed, 5 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 75fc22350..5c20fbe4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
      [auth-krb5.c]
      fix krb5 authorization check. found by <jhawk@MIT.EDU>. from 
      art@, deraadt@ ok
+   - markus@cvs.openbsd.org  2001/11/12 11:17:07
+     [servconf.c]
+     enable authorized_keys2 again. tested by fries@
 
 20011112
  - (djm) Makefile correctness fix from Mark D. Baushke <mdb@juniper.net>
@@ -6900,4 +6903,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1660 2001/11/13 13:02:10 djm Exp $
+$Id: ChangeLog,v 1.1661 2001/11/13 13:03:14 djm Exp $
diff --git a/servconf.c b/servconf.c
index 8e362b04d..e914d4cee 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.90 2001/11/11 13:02:31 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.91 2001/11/12 18:17:07 markus Exp $");
 
 #if defined(KRB4) || defined(KRB5)
 #include <krb.h>
@@ -220,8 +220,6 @@ fill_default_server_options(ServerOptions *options)
                 options->client_alive_interval = 0;  
         if (options->client_alive_count_max == -1)
                 options->client_alive_count_max = 3;
-        if (options->authorized_keys_file == NULL)
-                options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
         if (options->authorized_keys_file2 == NULL) {
                 /* authorized_keys_file2 falls back to authorized_keys_file */
                 if (options->authorized_keys_file != NULL)