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

bk: 661f94ff-q1DtLZ1_-16Up2e95N1tw

diff --git a/ChangeLog b/ChangeLog
index 019db478ad570d4804d1c01b370559e11e88f482..038a52ba7f2f49f090248d42f3b7f54f7452bfd5 100644 (file)
--- 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 bed128dce78e877c0719fc08cb8a7be9787d372b..585b8289bcdb3c1b9a4aad0cfe50c687e4dca3f2 100644 (file)
--- 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
        }
 
        /*