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

bk: 50ab045fzlj80ttAs5hQIu8o8ce03Q

diff --git a/ChangeLog b/ChangeLog
index 59937dda41071f616822cbeccdff31550aacb40f..849299cfcabf53f0daf83e1bd45f019edf97c8c0 100644 (file)
--- 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 1259d52c2db1ca89442e49d2dbd597c9cbd16478..397a80f3f3238f4f8b86a27ad637094ff2010e5f 100644 (file)
--- 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;