diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | servconf.c | 13 |
2 files changed, 14 insertions, 4 deletions
@@ -67,6 +67,9 @@ | |||
67 | - markus@cvs.openbsd.org 2001/11/10 13:37:20 | 67 | - markus@cvs.openbsd.org 2001/11/10 13:37:20 |
68 | [packet.c] | 68 | [packet.c] |
69 | remove extra debug() | 69 | remove extra debug() |
70 | - markus@cvs.openbsd.org 2001/11/11 13:02:31 | ||
71 | [servconf.c] | ||
72 | make AuthorizedKeysFile2 fallback to AuthorizedKeysFile if AuthorizedKeysFile is specified. | ||
70 | 73 | ||
71 | 20011109 | 74 | 20011109 |
72 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) | 75 | - (stevesk) auth-pam.c: use do_pam_authenticate(PAM_DISALLOW_NULL_AUTHTOK) |
@@ -6879,4 +6882,4 @@ | |||
6879 | - Wrote replacements for strlcpy and mkdtemp | 6882 | - Wrote replacements for strlcpy and mkdtemp |
6880 | - Released 1.0pre1 | 6883 | - Released 1.0pre1 |
6881 | 6884 | ||
6882 | $Id: ChangeLog,v 1.1655 2001/11/12 00:07:58 djm Exp $ | 6885 | $Id: ChangeLog,v 1.1656 2001/11/12 00:14:35 djm Exp $ |
diff --git a/servconf.c b/servconf.c index 6297143f1..d82e84275 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.89 2001/08/16 19:18:34 jakob Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.90 2001/11/11 13:02:31 markus Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) || defined(KRB5) | 15 | #if defined(KRB4) || defined(KRB5) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -213,8 +213,15 @@ fill_default_server_options(ServerOptions *options) | |||
213 | options->client_alive_count_max = 3; | 213 | options->client_alive_count_max = 3; |
214 | if (options->authorized_keys_file == NULL) | 214 | if (options->authorized_keys_file == NULL) |
215 | options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; | 215 | options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; |
216 | if (options->authorized_keys_file2 == NULL) | 216 | if (options->authorized_keys_file2 == NULL) { |
217 | options->authorized_keys_file2 = _PATH_SSH_USER_PERMITTED_KEYS2; | 217 | /* authorized_keys_file2 falls back to authorized_keys_file */ |
218 | if (options->authorized_keys_file != NULL) | ||
219 | options->authorized_keys_file2 = options->authorized_keys_file; | ||
220 | else | ||
221 | options->authorized_keys_file2 = _PATH_SSH_USER_PERMITTED_KEYS2; | ||
222 | } | ||
223 | if (options->authorized_keys_file == NULL) | ||
224 | options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; | ||
218 | if (options->pam_authentication_via_kbd_int == -1) | 225 | if (options->pam_authentication_via_kbd_int == -1) |
219 | options->pam_authentication_via_kbd_int = 0; | 226 | options->pam_authentication_via_kbd_int = 0; |
220 | } | 227 | } |