From: Dave Hart <hart@ntp.org>
Date: Tue, 9 Nov 2010 04:26:03 +0000 (+0000)
Subject: [Bug 1709] ntpdate ignores replies with equal receive and transmit timestamps.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bf3c8b9185fc269a8c923fc7d71bc70eb6eef26;p=thirdparty%2Fntp.git

[Bug 1709] ntpdate ignores replies with equal receive and transmit timestamps.

bk: 4cd8cd5b1op0Zh0MTlIpvgv0T2ZoeA
---

diff --git a/ChangeLog b/ChangeLog
index 805affdec7..fef5873cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 ---
+
+* [Bug 1709] ntpdate ignores replies with equal receive and transmit
+  timestamps.
+
+---
 (4.2.6p3-RC8) 2010/10/29 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 1685] NMEA driver mode byte confusion.
diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index a906ae283d..76ac6126a6 100644
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -868,8 +868,7 @@ receive(
 	 * Make sure the server is at least somewhat sane.	If not, try
 	 * again.
 	 */
-	if (L_ISZERO(&rec) || !L_ISHIS(&server->org, &rec)
-	    || L_ISEQU(&rec, &server->org)) {
+	if (L_ISZERO(&rec) || !L_ISHIS(&server->org, &rec)) {
 		server->event_time = current_time + sys_timeout;
 		return;
 	}