[Bug 2734] TEST3 prevents initial interleave sync

bk: 662f18d6iM9tKcZOv3KRP5MJuWMXPw

diff --git a/ChangeLog b/ChangeLog
index 0a3525e4cfc6cc2a716c116b6a9942bfe70c18a8..9787c3ea5f4a8f08f8ba5251b496ea55457585f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@
              Fix the script checkHtmlFileDates.  <burnicki@ntp.org>
 * [Bug 3756] Improve OpenSSL library/header detection.
 * [Bug 3753] ntpd fails to start with FIPS-enabled OpenSSL 3. <hart@ntp.org>
+* [Bug 2734] TEST3 prevents initial interleave sync.  Fix from <PoolMUC@web.de>
 * Remove extraneous */ from libparse/ieee754io.c
 * Fix .datecheck target line in Makefile.am.  <stenn@ntp.org>
 * Log failures to allocate receive buffers.  <hart@ntp.org>

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 585b8289bcdb3c1b9a4aad0cfe50c687e4dca3f2..170294c68bb6f8226cb5271b18bdf503434a120b 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2526,8 +2526,10 @@ receive(
         * more flashers. Leave if the packet is not good.
         */
        process_packet(peer, pkt, rbufp->recv_length);
-       if (peer->flash & PKT_TEST_MASK)
+       /* Bug 2734: TEST3 prevents initial interleave sync */
+       if ((~TEST3 & peer->flash) & PKT_TEST_MASK) {
                return;
+       }
 
        /* [bug 3592] Update poll. Ideally this should not happen in a
         * receive branch, but too much is going on here... at least we