From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 17 Apr 2024 09:23:11 +0000 (-0500)
Subject: [Bug 3870] Server drops client packets with ppoll < 4.  <stenn@ntp.org>
X-Git-Tag: NTP_4_2_8P18_RC1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44b90b71eeba2a1ec4c86c76ec4972c8aa4ad238;p=thirdparty%2Fntp.git

[Bug 3870] Server drops client packets with ppoll < 4.  <stenn@ntp.org>

bk: 661f94ff-q1DtLZ1_-16Up2e95N1tw
---

diff --git a/ChangeLog b/ChangeLog
index 019db478a..038a52ba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
 * [Bug 3871] 4.2.8p17 build without hopf6021 refclock enabled fails.
              Reported by Hans Mayer.  Moved NONEMPTY_TRANSLATION_UNIT
              declaration from ntp_types.h to config.h.  <hart@ntp.org>
+* [Bug 3870] Server drops client packets with ppoll < 4.  <stenn@ntp.org>
 * [Bug 3869] Remove long-gone "calldelay" & "crypto sign" from docs.
              Reported by PoolMUC@web.de. <hart@ntp.org>
 * [Bug 3868] Cannot restrict a pool peer. <hart@ntp.org>  Thanks to
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index bed128dce..585b8289b 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -819,10 +819,15 @@ receive(
 	        || (NTP_MAXPOLL < pkt->ppoll)
 	       )
 	   ) {
+#ifdef BUG3870
 		DPRINTF(2, ("receive: drop: Invalid ppoll (%d) from %s\n",
 				pkt->ppoll, stoa(&rbufp->recv_srcadr)));
 		sys_badlength++;
 		return;			/* invalid packet poll */
+#else
+		DPRINTF(2, ("receive: info: Invalid ppoll (%d) from %s\n",
+				pkt->ppoll, stoa(&rbufp->recv_srcadr)));
+#endif
 	}
 
 	/*