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.

(cherry picked from commit 81deb24deb26095cbf3eaec8e7763973ec4177c3)

diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
index ab7c25a0affbd94a5d680e26643f2d54067c6688..3adfe473eb075a3c6611495e601e87986a743caa 100644 (file)
--- 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 27c5f33e3b9e2fa66d6a0ec9ea23301e49f758c5..74374b106f364690ee972fcc9cd25d5689a8b541 100644 (file)
--- 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 a5d1c165fb8f95ed5c1fe741b6e00c48ebebd6a0..3df353b07d1871ba71c9c91c87df701a8eee9443 100644 (file)
--- 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;