diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-11-12 18:17:08 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-11-12 18:17:08 +0000 |
| commit | 7ec5775c8054508e04437f7b9763e8767099ecd9 (patch) | |
| tree | 9a2a0afddc36a237af792747c0dc2f4968cc313e /usr.bin/ssh | |
| parent | b3ee98ce2d3c7954668f3f642cbc62f5043d327a (diff) | |
enable authorized_keys2 again. tested by fries@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/servconf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index d6ce73dd5f3..4c944784eaa 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/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> @@ -210,8 +210,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) |