From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 23 Sep 2008 00:30:50 +0000 (-0400)
Subject: [Bug 1072] clock_update should not allow updates older than sys_epoch
X-Git-Tag: NTP_4_2_5P135~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e7df03d3303fec406b2cfa8e6c88e54667c126;p=thirdparty%2Fntp.git

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

bk: 48d838babZD4BPx9cerkriJIeVE8AA
---

diff --git a/ChangeLog b/ChangeLog
index b3bb2ce47..6952c4518 100644
--- 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 f25c271ad..a69b38330 100644
--- 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(