72 lines
2.2 KiB
Diff
72 lines
2.2 KiB
Diff
From 9582d05683742c4920c7125e8364a3345e6035b8 Mon Sep 17 00:00:00 2001
|
|
From: Evan Hunt <each@isc.org>
|
|
Date: Thu, 5 May 2022 14:52:15 -0700
|
|
Subject: [PATCH] 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)
|
|
Conflict: NA
|
|
Reference: https://gitlab.isc.org/isc-projects/bind9/-/commit/9582d05683742c4920c7125e8364a3345e6035b8
|
|
---
|
|
bin/tests/system/fetchlimit/ns3/named1.conf.in | 4 ++++
|
|
bin/tests/system/fetchlimit/ns3/named2.conf.in | 4 ++++
|
|
bin/tests/system/fetchlimit/ns3/named3.conf.in | 4 ++++
|
|
3 files changed, 12 insertions(+)
|
|
|
|
diff --git a/bin/tests/system/fetchlimit/ns3/named1.conf.in b/bin/tests/system/fetchlimit/ns3/named1.conf.in
|
|
index ab7c25a0af..3adfe473eb 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 27c5f33e3b..74374b106f 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 a5d1c165fb..3df353b07d 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;
|
|
--
|
|
2.23.0
|
|
|