From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 6 Sep 2019 06:41:13 +0000 (-0700)
Subject: [Bug 3613] Propagate noselect to mobilized pool servers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcf971e80d3829f5479a4ddc1e66018ac0f97451;p=thirdparty%2Fntp.git

[Bug 3613] Propagate noselect to mobilized pool servers

bk: 5d71ff89Ec_WsWoFae_GClu1n8ox9w
---

diff --git a/ChangeLog b/ChangeLog
index 9ff845c81..2674aa723 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 * [Sec 3565] Crafted null dereference attack in authenticated
 	     mode 6 packet <perlinger@ntp.org>
   - reported by Magnus Stubman
+* [Bug 3613] Propagate noselect to mobilized pool servers <stenn@ntp.org>
 * [Bug 3560] Fix build when HAVE_DROPROOT is not defined <perlinger@ntp.org>
   - applied patch by Ian Lepore
 * [Bug 3558] Crash and integer size bug <perlinger@ntp.org>
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index eb663515b..eaf62c6e8 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1386,7 +1386,10 @@ receive(
 		peer = newpeer(&rbufp->recv_srcadr, NULL, rbufp->dstadr,
 			       r4a.ippeerlimit, MODE_CLIENT, hisversion,
 			       peer2->minpoll, peer2->maxpoll,
-			       FLAG_PREEMPT | (FLAG_IBURST & peer2->flags),
+			       (  FLAG_PREEMPT
+			        | (FLAG_IBURST & peer2->flags)
+			        | (FLAG_NOSELECT & peer2->flags)
+			       ),
 			       MDF_UCAST | MDF_UCLNT, 0, skeyid, sys_ident);
 		if (NULL == peer) {
 			DPRINTF(2, ("receive: AM_MANYCAST drop: duplicate\n"));