From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 6 Jul 2016 08:47:02 +0000 (-0700)
Subject: [Bug 2961] sntp/tests/packetProcessing.c assumes AUTOKEY
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=597801854ea971f790c45fa8f0bb6e1ab41ffffa;p=thirdparty%2Fntp.git

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

bk: 577cc586BhnNp3morYvZVHW9FXnHsQ
---

diff --git a/ChangeLog b/ChangeLog
index 0805467dc..027802168 100644
--- 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 88e61cc89..1079cb7df 100644
--- 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 */
 }