From: Frank Kardel <kardel@ntp.org>
Date: Sat, 25 Aug 2007 13:22:24 +0000 (+0000)
Subject: ntp_config.c:
X-Git-Tag: NTP_4_2_5P72~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc86d6492182d27a5d60a3ce5b68aae0485d3c2;p=thirdparty%2Fntp.git

ntp_config.c:
  Bug 894: initialize keysdir BEFORE crypto_setup() is called - so it has a fair
  chance to find the keys.

bk: 46d02d10MVRZ15hK4azDQFOrMQXCRg
---

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index c3d75556c..792c8ac3a 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -977,6 +977,11 @@ config_auth(void)
 		destroy_queue(my_config.auth.crypto_cmd_list);
 		my_config.auth.crypto_cmd_list = NULL;
 	}
+
+	/* Keysdir Command */
+	if (my_config.auth.keysdir)
+		keysdir = my_config.auth.keysdir;
+
 #ifdef OPENSSL
 	crypto_setup();
 #endif /* OPENSSL */
@@ -985,10 +990,6 @@ config_auth(void)
 	if (my_config.auth.keys)
 		getauthkeys(my_config.auth.keys);
     
-	/* Keysdir Command */
-	if (my_config.auth.keysdir)
-		keysdir = my_config.auth.keysdir;
-
 	/* Control Key Command */
 	if (my_config.auth.control_key != 0) 
 		ctl_auth_keyid = my_config.auth.control_key;