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

bk: 4cd8cd5b1op0Zh0MTlIpvgv0T2ZoeA

diff --git a/ChangeLog b/ChangeLog
index 805affdec75782d96b01a3ca6aeb92f230e843ef..fef5873cec877b7bb86a6b65bac0e40e8667137a 100644 (file)
--- 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 a906ae283d94e61bfdb61272b98d747df2f6c498..76ac6126a6778472824cb012e6a885d16c8be682 100644 (file)
--- 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;
        }