upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 11:09:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move RRL broken-config check to checkconf

Browse source 
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.

(cherry picked from commit 05398c1488)
This commit is contained in:
Evan Hunt 2024-02-06 13:33:21 -08:00
parent a5a094c0af
commit 046b62bf02
4 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bin/tests/system/rrl/broken.conf.in → bin/tests/system/checkconf/bad-rrl-table-size.conf
View file

@ -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; };
};

2
bin/tests/system/rrl/clean.sh
View file

@ -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*

1
bin/tests/system/rrl/setup.sh
View file

@ -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

9
bin/tests/system/rrl/tests.sh
View file

@ -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