[Bug 1072] clock_update should not allow updates older than sys_epoch

bk: 48d838babZD4BPx9cerkriJIeVE8AA

diff --git a/ChangeLog b/ChangeLog
index b3bb2ce475c4310c4914a1776c4be2c89c378423..6952c4518e3727517396863b750575605735dfa4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1072] clock_update should not allow updates older than sys_epoch.
 (4.2.5p134) 2008/09/17 Released by Harlan Stenn <stenn@ntp.org>
 * Clean up build process for ntpsnmpd.
 (4.2.5p133) 2008/09/16 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index f25c271adb2ab1a6fc8f0f1e5ab1333c611f5ed4..a69b3833018da5cbd2115609bed922da255dfa71 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1654,10 +1654,10 @@ clock_update(
                dtemp = sys_mindisp;
 #endif /* REFCLOCK */
        sys_rootdisp = dtemp + peer->rootdisp;
-       epoch = peer->epoch - sys_epoch;
-       if (epoch <= 0)
+       if (peer->epoch <= sys_epoch)
                return;
-
+ 
+       epoch = peer->epoch - sys_epoch;
 #ifdef DEBUG
        if (debug)
                printf(