ChangeLog:

  [Bug 960] spurious crypto command
ntp_config.c:
  [Bug 960] spurious crypto command

bk: 474399abew3a_BpTuzEyuNOLopM0iQ

diff --git a/ChangeLog b/ChangeLog
index 46308f85dc2a86058b1677774f739e9890745144..36f1b7bad9293000d090da3e5ba1ecdd732466af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 960] spurious syslog:crypto_setup:spurious crypto command
 * [Bug 961] refclock_tpro.c:tpro_poll() calls refclock_receive() twice.
 * [Bug 957] Windows only: Let command line parameters from the Windows SCM GUI
   override the standard parameters from the ImagePath registry key.

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 30fef5d312e29b6f431fb3ad08e877cb232aadca..7029189942f95114a695255487e536fa31381123 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -989,8 +989,10 @@ config_auth(void)
                keysdir = my_config.auth.keysdir;
 
 #ifdef OPENSSL
-       if (cryptosw)
+       if (cryptosw) {
                crypto_setup();
+               cryptosw = 0;
+       }
 #endif /* OPENSSL */
  
        /* Keys Command */