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 c3d75556c7121200656b11ba9de807b017398f1e..792c8ac3affa1f0cf10587e2152220b1d73381ec 100644 (file)
--- 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;