From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 27 Jun 2007 02:43:22 +0000 (-0400)
Subject: [Bug 858] recent leapfile changes broke non-OpenSSL builds.
X-Git-Tag: NTP_4_2_5P56~2^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=411f5968d500f4e13c775c37f70964acad2f8c83;p=thirdparty%2Fntp.git

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

bk: 4681cecaJhAxdud1Sqy5zVDrVUV-DQ
---

diff --git a/ChangeLog b/ChangeLog
index 53bfbaa37..c2703fae8 100644
--- 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 884423e4e..b7d857366 100644
--- 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 */
 	}
 }