Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2998

bk: 57eb995fykF2UJv9w73TnIGALgQvgA

diff --cc ChangeLog
Simple merge

diff --cc sntp/tests/packetProcessing.c
index 1079cb7df6b4ad875bb45ec306449ca77544c151,660b5b6e20f15916fbb6a77046d99899a7c609c6..40805461619b45d3c9fa3b919acee7e1992c8410
--- 1/sntp/tests/packetProcessing.c
--- 2/sntp/tests/packetProcessing.c
+++ b/sntp/tests/packetProcessing.c
@@@ -152,7 -163,13 +163,17 @@@ test_LengthNotMultipleOfFour(void
  void
  test_TooShortExtensionFieldLength(void)
  {
++XXX BO FRAG 1
+       /* [Bug 2998] We have to get around the formal specification of
+        * the extension field if AUTOKEY is undefined. (At least CLANG
+        * issues a warning in this case. It's just a warning, but
+        * still...
+        */
+       uint32_t * pe = testpkt.p.exten + 7;
+       
++XXX ELSE
 +#ifdef AUTOKEY
++XXX EO FRAG 1
        /* The lower 16-bits are the length of the extension field.
         * This lengths must be multiples of 4 bytes, which gives
         * a minimum of 4 byte extension field length.
@@@ -166,9 -183,8 +187,17 @@@
        int pkt_len = LEN_PKT_NOMAC + 4 + 24;
  
        TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
++XXX ORIG FRAG 2
++                        process_pkt(&testpkt, &testsock, pkt_len,
++                                    MODE_SERVER, &testspkt, "UnitTest"));
++XXX BO FRAG 2
+                         process_pkt(&testpkt.p, &testsock, pkt_len,
+                                     MODE_SERVER, &testspkt.p, "UnitTest"));
++XXX ELSE FRAG 2
 +                        process_pkt(&testpkt, &testsock, pkt_len,
 +                                    MODE_SERVER, &testspkt, "UnitTest"));
 +#endif  /* AUTOKEY */
++XXX EO FRAG 2
  }