[Bug 1797] Restore stale timestamp check from the RANGEGATE cleanup

bk: 4d425d11TOYwXG18f17c3_12TdKlxA

diff --git a/ChangeLog b/ChangeLog
index 0255ecd93718cf83fd76a30b0a00740fa3477c26..7d6704339e2e203f4e7fc0ee40c906f4816d80e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1797] Restore stale timestamp check from the RANGEGATE cleanup.
 (4.2.7p126) 2011/01/27 Released by Harlan Stenn <stenn@ntp.org>
 * Fix unexposed fencepost error in COUNTOF().
 * Add more unit tests for timeval_tostr() and timespec_tostr().

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 16fc6d2688b2a6d8ef814fe0ca223ceb1fae14af..8711dd8e9aeed729f23c2c953e03aac7bec1ca11 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -1323,6 +1323,9 @@ refclock_pps(
        else
                return (0);
 
+       if (timeout.tv_sec == ap->ts.tv_sec)
+               return (0);
+
        /*
         * Convert to signed fraction offset and stuff in median filter.
         */