diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-12-15 21:59:23 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-12-16 04:19:41 +0100 |
| commit | 3145d38ea06820a66c0f5e068f49af14fd2b7ac1 (patch) | |
| tree | 1b4739e3b7264ee9e0bddce7f29e6696a1697ea9 /servconf.c | |
| parent | upstream: do not attempt to find an absolute path for sshd_config (diff) | |
| download | openssh-3145d38ea06820a66c0f5e068f49af14fd2b7ac1.tar.xz openssh-3145d38ea06820a66c0f5e068f49af14fd2b7ac1.zip | |
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.c | 3 |
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 @@ -/* $OpenBSD: servconf.c,v 1.356 2019/12/15 20:57:15 djm Exp $ */ +/* $OpenBSD: servconf.c,v 1.357 2019/12/15 20:59:23 djm Exp $ */ /* * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved @@ -455,6 +455,7 @@ fill_default_server_options(ServerOptions *options) CLEAR_ON_NONE(options->adm_forced_command); CLEAR_ON_NONE(options->chroot_directory); CLEAR_ON_NONE(options->routing_domain); + CLEAR_ON_NONE(options->host_key_agent); for (i = 0; i < options->num_host_key_files; i++) CLEAR_ON_NONE(options->host_key_files[i]); for (i = 0; i < options->num_host_cert_files; i++) |