From: Evan Hunt <each@isc.org>
Date: Thu, 5 May 2022 21:52:15 +0000 (-0700)
Subject: Disable EDNS for the fetchlimit test server
X-Git-Tag: v9.19.2~34^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=81deb24deb26095cbf3eaec8e7763973ec4177c3;p=thirdparty%2Fbind9.git

Disable EDNS for the fetchlimit test server

The fetchlimit test depends on a resolver continuing to try UDP
and timing out while the client waits for resolution to succeed.
but since commit bb990030 (flag day 2020), a fetch will always
switch to TCP after two timeouts, unless EDNS was disabled for
the query.

This commit adds "edns no;" to server statements in the fetchlimit
resolver, to restore the behavior expected by the test.
---

diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
index ab7c25a0aff..3adfe473eb0 100644
--- a/bin/tests/system/fetchlimit/ns3/named1.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named1.conf.in
@@ -28,6 +28,10 @@ options {
 	fetches-per-server 400;
 };
 
+server 10.53.0.4 {
+	edns no;
+};
+
 key rndc_key {
 	secret "1234abcd8765";
 	algorithm hmac-sha256;
diff --git a/bin/tests/system/fetchlimit/ns3/named2.conf.in b/bin/tests/system/fetchlimit/ns3/named2.conf.in
index 27c5f33e3b9..74374b106f3 100644
--- a/bin/tests/system/fetchlimit/ns3/named2.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named2.conf.in
@@ -26,6 +26,10 @@ options {
 	fetches-per-zone 40;
 };
 
+server 10.53.0.4 {
+	edns no;
+};
+
 key rndc_key {
 	secret "1234abcd8765";
 	algorithm hmac-sha256;
diff --git a/bin/tests/system/fetchlimit/ns3/named3.conf.in b/bin/tests/system/fetchlimit/ns3/named3.conf.in
index a5d1c165fb8..3df353b07d1 100644
--- a/bin/tests/system/fetchlimit/ns3/named3.conf.in
+++ b/bin/tests/system/fetchlimit/ns3/named3.conf.in
@@ -26,6 +26,10 @@ options {
 	recursive-clients 400;
 };
 
+server 10.53.0.4 {
+	edns no;
+};
+
 key rndc_key {
 	secret "1234abcd8765";
 	algorithm hmac-sha256;