[openssh-commits] [openssh] 04/06: upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 5886b92968b360623491699247caddfb77a74d80
Author: markus at openbsd.org <markus at openbsd.org>
Date:   Thu Mar 1 20:32:16 2018 +0000

    upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by
    
    jmc@
    
    OpenBSD-Commit-ID: 9039cb69a3f9886bfef096891a9e7fcbd620280b
---
 servconf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/servconf.c b/servconf.c
index c87a9a2b..0f0d0906 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.325 2018/02/23 15:58:37 markus Exp $ */
+/* $OpenBSD: servconf.c,v 1.326 2018/03/01 20:32:16 markus Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -253,8 +253,10 @@ fill_default_server_options(ServerOptions *options)
 #endif
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_ED25519_KEY_FILE);
+#ifdef WITH_XMSS
 		servconf_add_hostkey("[default]", 0, options,
 		    _PATH_HOST_XMSS_KEY_FILE);
+#endif /* WITH_XMSS */
 	}
 	/* No certificates by default */
 	if (options->num_ports == 0)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.