[Bug 3660] Revert 4.2.8p15 change to manycast.

bk: 63f3a9aaQ1iWqRS_AVbo_MpQG1CJ_Q

diff --git a/ChangeLog b/ChangeLog
index 0ba366ce1f70dd6699e9802bb6df01488fd67667..048ba9aefa3c0d501b34c1be787ce5d069aed3b2 100644 (file)
--- 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 182bfc6124fa57060e6ce801fd95128650e34167..5812cb9dedebf1842439344b76477c6f391bc95d 100644 (file)
--- 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));