From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 20 Nov 2012 04:17:35 +0000 (-0800)
Subject: [Bug 2246] Clear sys_leap when voting says to disarm the leap
X-Git-Tag: NTP_4_2_7P326~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=667d5d87bea013db6cb1125a41efc5cc37c9beea;p=thirdparty%2Fntp.git

[Bug 2246] Clear sys_leap when voting says to disarm the leap

bk: 50ab045fzlj80ttAs5hQIu8o8ce03Q
---

diff --git a/ChangeLog b/ChangeLog
index 59937dda4..849299cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * [Bug 1214] 'proto: precision = ...' should be at INFO, not NOTICE.
+* [Bug 2246] Clear sys_leap when voting says to disarm the leap.
 (4.2.7p324) 2012/11/19 Released by Harlan Stenn <stenn@ntp.org>
 * Reinstate doc fix to authentic.html from Mike T.
 * [Bug 1223] cleanup for rlimit changes.
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 1259d52c2..397a80f3f 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1948,6 +1948,7 @@ clock_update(
 		} else if (leapsec > 0) {
 			report_event(EVNT_DISARMED, NULL, NULL);
 			leapsec = 0;
+			sys_leap = LEAP_NOWARNING;
 		}
 		break;