summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-05-01 04:17:51 +0000
committerDamien Miller <djm@mindrot.org>2015-05-10 11:54:56 +1000
commit7e8528cad04b2775c3b7db08abf8fb42e47e6b2a (patch)
treed8aead0c28c8b0a71c47e2ee5804d085d34bb435 /servconf.c
parentca430d4d9cc0f62eca3b1fb1e2928395b7ce80f7 (diff)
upstream commit
make handling of AuthorizedPrincipalsFile=none more consistent with other =none options; bz#2288 from Jakub Jelen; ok dtucker@
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c
index c0291947b..fadfa2757 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.269 2015/05/04 06:10:48 djm Exp $ */ 1/* $OpenBSD: servconf.c,v 1.267 2015/05/01 04:17: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
@@ -352,6 +352,7 @@ fill_default_server_options(ServerOptions *options)
352 CLEAR_ON_NONE(options->banner); 352 CLEAR_ON_NONE(options->banner);
353 CLEAR_ON_NONE(options->trusted_user_ca_keys); 353 CLEAR_ON_NONE(options->trusted_user_ca_keys);
354 CLEAR_ON_NONE(options->revoked_keys_file); 354 CLEAR_ON_NONE(options->revoked_keys_file);
355 CLEAR_ON_NONE(options->authorized_principals_file);
355 for (i = 0; i < options->num_host_key_files; i++) 356 for (i = 0; i < options->num_host_key_files; i++)
356 CLEAR_ON_NONE(options->host_key_files[i]); 357 CLEAR_ON_NONE(options->host_key_files[i]);
357 for (i = 0; i < options->num_host_cert_files; i++) 358 for (i = 0; i < options->num_host_cert_files; i++)