[Bug 858] recent leapfile changes broke non-OpenSSL builds.

bk: 4681cecaJhAxdud1Sqy5zVDrVUV-DQ

diff --git a/ChangeLog b/ChangeLog
index 53bfbaa37693287ce4acf813f362af6e6adf524c..c2703fae805121a01c1156d153a5ca0960e1a5b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,11 @@
-* Use emalloc() instead of malloc() in refclock_datum.c (Calypso).
+* [Bug 858] recent leapfile changes broke non-OpenSSL builds.
+* Use emalloc() instead of malloc() in refclock_datum.c (Calysto).
 * Start using 'design by contract' assertions.
+* [Bug 767] Fast sync to refclocks wanted.
 * Allow null driftfile.
 * leap second infrastructure fixes from Dave Mills.
 * Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.
-* [Bug #629] changes to ensure broadcast works including on wildcard addresses
+* [Bug 629] changes to ensure broadcast works including on wildcard addresses
 * [Bug 853] get_node() must return a pointer to maximally-aligned memory.
 * Initial leap file fixes from Dave Mills.
 * [Bug 858] Recent leapfile changes broke without OPENSSL.

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 884423e4eb645d2e985c9cb1c3e1644474a3c5c6..b7d857366ccd561e459a086c7129046df1d88a63 100644 (file)
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -1441,7 +1441,6 @@ ctl_putsys(
                        ctl_putstr(sys_var[CS_IDENT].text,
                            mvpar_file, strlen(mvpar_file));
                break;
-#endif /* OPENSSL */
 
        case CS_LEAPTAB:
                ctl_putuint(sys_var[CS_LEAPTAB].text,
@@ -1451,6 +1450,8 @@ ctl_putsys(
        case CS_TAI:
                ctl_putuint(sys_var[CS_TAI].text, sys_tai);
                break;
+
+#endif /* OPENSSL */
        }
 }