[Sec 3453] Interleaved symmetric mode cannot recover from bad state

bk: 5a76f46bK1M87GD1tJounOczC-5Zow

diff --git a/ChangeLog b/ChangeLog
index 1ca07f4e08c3a45c0ef037591a3ac3543f2425b4..e0086e0140e2490cecdc98a4fa0d2a92a2681870 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 * [Sec 3454] Unauthenticated packet can reset authenticated interleave
   associations.  HStenn.
+* [Sec 3453] Interleaved symmetric mode cannot recover from bad state.  HStenn.
 * [Sec 3415] Permit blocking authenticated symmetric/passive associations.
   Implement ippeerlimit.  HStenn, JPerlinger.
 * [Sec 3414] ntpq: decodearr() can write beyond its 'buf' limits

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index c599aa17a63eef2ea4b8289d8ba04f9fda6df993..021d7f0aa1c283e58a20086934d22bb120eeb187 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2007,7 +2007,9 @@ receive(
                peer->bogusorg++;
                peer->flags |= FLAG_XBOGUS;
                peer->flash |= TEST2;           /* bogus */
+#ifdef BUG3453
                return; /* Bogus packet, we are done */
+#endif
        }
 
        /**/