summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/servconf.c b/servconf.c
index d26a7db05..41c9c6964 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.211 2010/09/22 05:01:29 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.212 2010/09/30 11:04:51 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -259,12 +259,12 @@ fill_default_server_options(ServerOptions *options)
259 if (options->authorized_keys_file2 == NULL) { 259 if (options->authorized_keys_file2 == NULL) {
260 /* authorized_keys_file2 falls back to authorized_keys_file */ 260 /* authorized_keys_file2 falls back to authorized_keys_file */
261 if (options->authorized_keys_file != NULL) 261 if (options->authorized_keys_file != NULL)
262 options->authorized_keys_file2 = options->authorized_keys_file; 262 options->authorized_keys_file2 = xstrdup(options->authorized_keys_file);
263 else 263 else
264 options->authorized_keys_file2 = _PATH_SSH_USER_PERMITTED_KEYS2; 264 options->authorized_keys_file2 = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS2);
265 } 265 }
266 if (options->authorized_keys_file == NULL) 266 if (options->authorized_keys_file == NULL)
267 options->authorized_keys_file = _PATH_SSH_USER_PERMITTED_KEYS; 267 options->authorized_keys_file = xstrdup(_PATH_SSH_USER_PERMITTED_KEYS);
268 if (options->permit_tun == -1) 268 if (options->permit_tun == -1)
269 options->permit_tun = SSH_TUNMODE_NO; 269 options->permit_tun = SSH_TUNMODE_NO;
270 if (options->zero_knowledge_password_authentication == -1) 270 if (options->zero_knowledge_password_authentication == -1)