From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 13 Mar 2021 03:40:43 +0000 (+1100)
Subject: Only call dh_set_moduli_file if using OpenSSL.
X-Git-Tag: V_8_6_P1~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ca8a9216559349c56e09039c4335636fd85c241;p=thirdparty%2Fopenssh-portable.git

Only call dh_set_moduli_file if using OpenSSL.

Fixes link failure when configuring --without-openssl since dh.c is not
linked in.
---

diff --git a/sshd.c b/sshd.c
index bda7455fd..32dd4dd4d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1725,8 +1725,10 @@ main(int ac, char **av)
 	parse_server_config(&options, rexeced_flag ? "rexec" : config_file_name,
 	    cfg, &includes, NULL);
 
+#ifdef WITH_OPENSSL
 	if (options.moduli_file != NULL)
 		dh_set_moduli_file(options.moduli_file);
+#endif
 
 	/* Fill in default values for those options not explicitly set. */
 	fill_default_server_options(&options);