summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2018-03-01 20:32:16 +0000
committerDamien Miller <djm@mindrot.org>2018-03-02 14:30:15 +1100
commit5886b92968b360623491699247caddfb77a74d80 (patch)
tree2f9cb53aa78226f2494b7cdc03c9386e68148219
parent3b36bed3d26f17f6a2b7e036e01777770fe1bcd4 (diff)
upstream: missing #ifdef for _PATH_HOST_XMSS_KEY_FILE; report by
jmc@ OpenBSD-Commit-ID: 9039cb69a3f9886bfef096891a9e7fcbd620280b
-rw-r--r--servconf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c
index c87a9a2b6..0f0d09068 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.325 2018/02/23 15:58:37 markus Exp $ */ 2/* $OpenBSD: servconf.c,v 1.326 2018/03/01 20:32:16 markus Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -253,8 +253,10 @@ fill_default_server_options(ServerOptions *options)
253#endif 253#endif
254 servconf_add_hostkey("[default]", 0, options, 254 servconf_add_hostkey("[default]", 0, options,
255 _PATH_HOST_ED25519_KEY_FILE); 255 _PATH_HOST_ED25519_KEY_FILE);
256#ifdef WITH_XMSS
256 servconf_add_hostkey("[default]", 0, options, 257 servconf_add_hostkey("[default]", 0, options,
257 _PATH_HOST_XMSS_KEY_FILE); 258 _PATH_HOST_XMSS_KEY_FILE);
259#endif /* WITH_XMSS */
258 } 260 }
259 /* No certificates by default */ 261 /* No certificates by default */
260 if (options->num_ports == 0) 262 if (options->num_ports == 0)