summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c
index 8e362b04d..e914d4cee 100644
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: servconf.c,v 1.90 2001/11/11 13:02:31 markus Exp $"); 13RCSID("$OpenBSD: servconf.c,v 1.91 2001/11/12 18:17:07 markus Exp $");
14 14
15#if defined(KRB4) || defined(KRB5) 15#if defined(KRB4) || defined(KRB5)
16#include <krb.h> 16#include <krb.h>
@@ -220,8 +220,6 @@ fill_default_server_options(ServerOptions *options)
220 options->client_alive_interval = 0; 220 options->client_alive_interval = 0;
221 if (options->client_alive_count_max == -1) 221 if (options->client_alive_count_max == -1)
222 options->client_alive_count_max = 3; 222 options->client_alive_count_max = 3;
223 if (options->authorized_keys_file == NULL)
224 options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS;
225 if (options->authorized_keys_file2 == NULL) { 223 if (options->authorized_keys_file2 == NULL) {
226 /* authorized_keys_file2 falls back to authorized_keys_file */ 224 /* authorized_keys_file2 falls back to authorized_keys_file */
227 if (options->authorized_keys_file != NULL) 225 if (options->authorized_keys_file != NULL)