[Bug 3613] Propagate noselect to mobilized pool servers

bk: 5d71ff89Ec_WsWoFae_GClu1n8ox9w

diff --git a/ChangeLog b/ChangeLog
index 9ff845c81028eeecbd72fd587d28555bc5f781e5..2674aa723064ba810955a06e7ee30630191d5a21 100644 (file)
--- 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 eb663515b8a4b8a6dda1fdeff63543ad8d724504..eaf62c6e88ce3e0893694601d397e38b0bd0b0fe 100644 (file)
--- 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"));