commit 5886b92968b360623491699247caddfb77a74d80
author markus@openbsd.org <markus@openbsd.org> Thu Mar 01 20:32:16 2018 +0000
committer Damien Miller <djm@mindrot.org> Fri Mar 02 14:30:15 2018 +1100
tree 2f9cb53aa78226f2494b7cdc03c9386e68148219
parent 3b36bed3d26f17f6a2b7e036e01777770fe1bcd4

upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by

jmc@

OpenBSD-Commit-ID: 9039cb69a3f9886bfef096891a9e7fcbd620280b

servconf.c

diff --git a/servconf.c b/servconf.c
index c87a9a2..0f0d090 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@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -253,8 +253,10 @@
 #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)