[Bug 2961] sntp/tests/packetProcessing.c assumes AUTOKEY

bk: 577cc586BhnNp3morYvZVHW9FXnHsQ

diff --git a/ChangeLog b/ChangeLog
index 0805467dc6b9b1ce7768a039f6a2d87af37546b9..02780216843f43cd77adfb4d59ef7e97dbe4b729 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+
+* [Bug 2961] sntp/tests/packetProcessing.c assumes AUTOKEY.  HStenn.
+
 ---
 (4.2.8p8) 2016/06/02 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/sntp/tests/packetProcessing.c b/sntp/tests/packetProcessing.c
index 88e61cc89d91c92254d326e41ae52d170b87312c..1079cb7df6b4ad875bb45ec306449ca77544c151 100644 (file)
--- a/sntp/tests/packetProcessing.c
+++ b/sntp/tests/packetProcessing.c
@@ -1,9 +1,9 @@
 #include "config.h"
 
 /* need autokey for some of the tests, or the will create buffer overruns. */
-#ifndef AUTOKEY
-# define AUTOKEY 1
-#endif
+// #ifndef AUTOKEY
+// # define AUTOKEY 1
+// #endif
 
 #include "sntptest.h"
 #include "networking.h"
@@ -152,6 +152,7 @@ test_LengthNotMultipleOfFour(void)
 void
 test_TooShortExtensionFieldLength(void)
 {
+#ifdef AUTOKEY
        /* 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.
@@ -167,6 +168,7 @@ test_TooShortExtensionFieldLength(void)
        TEST_ASSERT_EQUAL(PACKET_UNUSEABLE,
                          process_pkt(&testpkt, &testsock, pkt_len,
                                      MODE_SERVER, &testspkt, "UnitTest"));
+#endif  /* AUTOKEY */
 }