summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-12-15 20:59:23 +0000
committerDamien Miller <djm@mindrot.org>2019-12-16 14:19:41 +1100
commit3145d38ea06820a66c0f5e068f49af14fd2b7ac1 (patch)
tree1b4739e3b7264ee9e0bddce7f29e6696a1697ea9 /servconf.c
parent747e25192f436e71dd39e15d65aa32bca967533a (diff)
upstream: don't treat HostKeyAgent=none as a path either; avoids
spurious warnings from the cfgparse regress test OpenBSD-Commit-ID: ba49ea7a5c92b8a16cb9c2e975dbb163853afc54
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 9fe02d7e8..09e9df8bd 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.356 2019/12/15 20:57:15 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.357 2019/12/15 20:59:23 djm Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -455,6 +455,7 @@ fill_default_server_options(ServerOptions *options)
455 CLEAR_ON_NONE(options->adm_forced_command); 455 CLEAR_ON_NONE(options->adm_forced_command);
456 CLEAR_ON_NONE(options->chroot_directory); 456 CLEAR_ON_NONE(options->chroot_directory);
457 CLEAR_ON_NONE(options->routing_domain); 457 CLEAR_ON_NONE(options->routing_domain);
458 CLEAR_ON_NONE(options->host_key_agent);
458 for (i = 0; i < options->num_host_key_files; i++) 459 for (i = 0; i < options->num_host_key_files; i++)
459 CLEAR_ON_NONE(options->host_key_files[i]); 460 CLEAR_ON_NONE(options->host_key_files[i]);
460 for (i = 0; i < options->num_host_cert_files; i++) 461 for (i = 0; i < options->num_host_cert_files; i++)