From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Feb 2023 17:11:06 +0000 (-0500)
Subject: [Bug 3660] Revert 4.2.8p15 change to manycast.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26718b3335c96e00c3c0d34b892eb21f6cf366d0;p=thirdparty%2Fntp.git

[Bug 3660] Revert 4.2.8p15 change to manycast.

bk: 63f3a9aaQ1iWqRS_AVbo_MpQG1CJ_Q
---

diff --git a/ChangeLog b/ChangeLog
index 0ba366ce1..048ba9aef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---
-
+* [Bug 3660] Revert 4.2.8p15 change to manycast. <hart@ntp.org>
 * [Bug 3786] Timer starvation on high-load Windows ntpd. <hart@ntp.org>
 * [Bug 2410] syslog an error message on panic exceeded. <brian.utterback@oracle.com>
 * [Bug 3784] high-load ntpd on Windows deaf after enough ICMP TTL exceeded <hart@ntp.org>
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 182bfc612..5812cb9de 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1333,7 +1333,7 @@ receive(
 		 * manycaster has already synchronized to us.
 		 */
 		if (   sys_leap == LEAP_NOTINSYNC
-		    || sys_stratum > hisstratum + 1
+		    || sys_stratum >= hisstratum
 		    || (!sys_cohort && sys_stratum == hisstratum + 1)
 		    || rbufp->dstadr->addr_refid == pkt->refid) {
 			DPRINTF(2, ("receive: sys leap: %0x, sys_stratum %d > hisstratum+1 %d, !sys_cohort %d && sys_stratum == hisstratum+1, loop refid %#x == pkt refid %#x\n", sys_leap, sys_stratum, hisstratum + 1, !sys_cohort, rbufp->dstadr->addr_refid, pkt->refid));