From: Evan Hunt <each@isc.org>
Date: Tue, 6 Feb 2024 21:33:21 +0000 (-0800)
Subject: move RRL broken-config check to checkconf
X-Git-Tag: v9.19.22~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05398c14889550a052cc262d454edbd05900bba7;p=thirdparty%2Fbind9.git

move RRL broken-config check to checkconf

the RRL test included a test case that tried to start named with
a broken configuration.  the same error could be found with
named-checkconf, so it should have been tested in the checkconf
system test.
---

diff --git a/bin/tests/system/rrl/broken.conf.in b/bin/tests/system/checkconf/bad-rrl-table-size.conf
similarity index 59%
rename from bin/tests/system/rrl/broken.conf.in
rename to bin/tests/system/checkconf/bad-rrl-table-size.conf
index 21af240d74e..3325406fa88 100644
--- a/bin/tests/system/rrl/broken.conf.in
+++ b/bin/tests/system/checkconf/bad-rrl-table-size.conf
@@ -11,20 +11,7 @@
  * information regarding copyright ownership.
  */
 
-controls { /* empty */ };
-
 options {
-	query-source address 10.53.0.5;
-	notify-source 10.53.0.5;
-	transfer-source 10.53.0.5;
-	port @PORT@;
-	pid-file "named.pid";
-	statistics-file	"named.stats";
-	listen-on { 10.53.0.5; };
-	listen-on-v6 { none; };
-	notify no;
-	dnssec-validation no;
-
 	rate-limit {
 	    responses-per-second 2;
 	    all-per-second 50;
@@ -36,12 +23,3 @@ options {
 	    max-table-size 0;
 	};
 };
-
-key rndc_key {
-	secret "1234abcd8765";
-	algorithm @DEFAULT_HMAC@;
-};
-
-controls {
-	inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
-};
diff --git a/bin/tests/system/rrl/clean.sh b/bin/tests/system/rrl/clean.sh
index 11b87603078..2d41acadd3b 100644
--- a/bin/tests/system/rrl/clean.sh
+++ b/bin/tests/system/rrl/clean.sh
@@ -14,8 +14,6 @@
 # Clean up after rrl tests.
 
 rm -f */named.memstats */named.run */named.stats */log-* */session.key
-rm -f broken.conf
-rm -f broken.out
 rm -f dig.out* *mdig.out*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh
index 752b02ceede..49a642683d4 100644
--- a/bin/tests/system/rrl/setup.sh
+++ b/bin/tests/system/rrl/setup.sh
@@ -15,7 +15,6 @@
 
 $SHELL clean.sh
 
-copy_setports broken.conf.in broken.conf
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
 copy_setports ns3/named.conf.in ns3/named.conf
diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh
index eb7ad34da5f..72c12c93a03 100644
--- a/bin/tests/system/rrl/tests.sh
+++ b/bin/tests/system/rrl/tests.sh
@@ -274,15 +274,5 @@ fi
 DIGOPTS="+bufsize=4096 +ignore -p ${PORT}"
 $DIG $DIGOPTS @$ns4 TXT big.tld4 >/dev/null 2>&1
 
-# check named doesn't start with a broken config
-$NAMED -D rrl-ns5 -gc broken.conf >broken.out 2>&1 &
-sleep 2
-grep "min-table-size 1" broken.out >/dev/null || setret "min-table-size 0 was not changed to 1"
-
-if [ -f named.pid ]; then
-  kill $(cat named.pid)
-  setret "named should not have started, but did"
-fi
-
 echo_i "exit status: $ret"
 [ $ret -eq 0 ] || exit 1