upstream: silence (to log level debug2) failure messages when

loading the default hostkeys. Hostkeys explicitly specified in the
configuration or on the command-line are still reported as errors, and
failure to load at least one host key remains a fatal error.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on patch from Dag-Erling Smørgrav via
https://github.com/openssh/openssh-portable/pull/103

ok markus@

OpenBSD-Commit-ID: ffc2e35a75d1008effaf05a5e27425041c27b684

1 files changed, 3 insertions, 2 deletions

diff --git a/servconf.h b/servconf.h
index 0175e00e8..548ad5a0c 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.h,v 1.137 2018/09/20 03:28:06 djm Exp $ */
+/* $OpenBSD: servconf.h,v 1.138 2018/11/19 04:12:32 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -75,6 +75,7 @@ typedef struct {
         char    *routing_domain;        /* Bind session to routing domain */
 
         char   **host_key_files;        /* Files containing host keys. */
+        int     *host_key_file_userprovided; /* Key was specified by user. */
         u_int   num_host_key_files;     /* Number of files for host keys. */
         char   **host_cert_files;       /* Files containing host certs. */
         u_int   num_host_cert_files;    /* Number of files for host certs. */
@@ -273,7 +274,7 @@ void	 copy_set_server_options(ServerOptions *, ServerOptions *, int);
 void     dump_config(ServerOptions *);
 char    *derelativise_path(const char *);
 void     servconf_add_hostkey(const char *, const int,
-            ServerOptions *, const char *path);
+            ServerOptions *, const char *path, int);
 void     servconf_add_hostcert(const char *, const int,
             ServerOptions *, const char *path);