From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 15 Sep 2012 04:35:46 +0000 (-0400)
Subject: [Bug 2258] Add syslog message about leap insertion
X-Git-Tag: NTP_4_2_7P305~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7290d74b9229ef24221b2fef32fd0d013eb7960;p=thirdparty%2Fntp.git

[Bug 2258] Add syslog message about leap insertion

bk: 505405a2w15nLnFhoHfwNrErTVArJQ
---

diff --git a/ChangeLog b/ChangeLog
index b2de28dd2..0b6171636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 * [Bug 752] Use proper ToS network packet markings for IPv4 and IPv6.
 * [Bug 1232] Convert SHM refclock to use struct timespec.
+* [Bug 2258] Add syslog message about leap insertion.
 * [Bug 2263] broadcast server doesn't work for host with
   OS_MISSES_SPECIFIC_ROUTE_UPDATES.
 * [Bug 2271] Decode refclock types when built with --disable-all-clocks.
diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index 974f5ddd9..29c5e2a85 100644
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -363,14 +363,15 @@ timer(void)
 		if (leapsec == 0) {
 			sys_leap = LEAP_NOWARNING;
 			sys_tai = leap_tai;
-#ifdef KERNEL_PLL
+#ifndef SYS_WINNT /* WinNT port has its own leap second handling */
+# ifdef KERNEL_PLL
 			if (!(pll_control && kern_enable))
+# endif /* KERNEL_PLL */
+			{
 				step_systime(-1.0);
-#else /* KERNEL_PLL */
-#ifndef SYS_WINNT /* WinNT port has its own leap second handling */
-			step_systime(-1.0);
+				msyslog(LOG_NOTICE, "Inserting positive leap second.");
+			}
 #endif /* SYS_WINNT */
-#endif /* KERNEL_PLL */
 			report_event(EVNT_LEAP, NULL, NULL);
 		} else {
 			if (leapsec < DAY)