From: djm@openbsd.org <djm@openbsd.org>
Date: Sun, 15 Dec 2019 20:59:23 +0000 (+0000)
Subject: upstream: don't treat HostKeyAgent=none as a path either; avoids
X-Git-Tag: V_8_2_P1~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3145d38ea06820a66c0f5e068f49af14fd2b7ac1;p=thirdparty%2Fopenssh-portable.git

upstream: don't treat HostKeyAgent=none as a path either; avoids

spurious warnings from the cfgparse regress test

OpenBSD-Commit-ID: ba49ea7a5c92b8a16cb9c2e975dbb163853afc54
---

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++)