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 956593a6fc..3325406fa8 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 hmac-sha256; -}; -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 88c9a56670..ce3db9b841 100644 --- a/bin/tests/system/rrl/clean.sh +++ b/bin/tests/system/rrl/clean.sh @@ -18,6 +18,4 @@ rm -f */named.memstats */named.run */named.stats */log-* */session.key rm -f ns3/bl*.db */*.jnl */*.core */*.pid rm -f ns*/named.lock rm -f ns*/named.conf -rm -f broken.conf -rm -f broken.out rm -f ns*/managed-keys.bind* diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh index 752b02ceed..49a642683d 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 9bd6643afd..9b28f9d8db 100644 --- a/bin/tests/system/rrl/tests.sh +++ b/bin/tests/system/rrl/tests.sh @@ -278,14 +278,5 @@ $DIG $DIGOPTS @$ns4 TXT big.tld4 >/dev/null 2>&1 grep "would limit" ns4/named.run >/dev/null 2>&1 \ || setret "\"would limit\" not found in log file." -$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