mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

fix rpz test

Browse Source 
- work around a CR newline problem
- use rndc to stop servers
This commit is contained in:
Evan Hunt
2019-01-24 09:42:30 -08:00
parent f7471494ed
commit 8cd39fae80
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/tests/system/rpz/ns1/named.conf.in
View File

@@ -22,4 +22,13 @@ options {
minimal-responses no; minimal-responses no;
}; };
key rndc_key {
secret "1234abcd8765";
algorithm hmac-sha256;
};
controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
zone "." {type master; file "root.db";}; zone "." {type master; file "root.db";};

9
bin/tests/system/rpz/ns4/named.conf.in
View File

@@ -24,6 +24,15 @@ options {
dnssec-validation yes; dnssec-validation yes;
}; };
key rndc_key {
secret "1234abcd8765";
algorithm hmac-sha256;
};
controls {
inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
include "../trusted.conf"; include "../trusted.conf";
zone "." { type hint; file "hints"; }; zone "." { type hint; file "hints"; };

6
bin/tests/system/rpz/tests.sh
View File

@@ -358,7 +358,7 @@ addr () {
digcmd $2 >$DIGNM digcmd $2 >$DIGNM
#ckalive "$2" "server crashed by 'dig $2'" || return 1 #ckalive "$2" "server crashed by 'dig $2'" || return 1
ADDR_ESC=`echo "$ADDR" | sed -e 's/\./\\\\./g'` ADDR_ESC=`echo "$ADDR" | sed -e 's/\./\\\\./g'`
ADDR_TTL=`sed -n -e "s/^[-.a-z0-9]\{1,\}[ ]*\([0-9]*\) IN AA* ${ADDR_ESC}\$/\1/p" $DIGNM` ADDR_TTL=`tr -d '\r' < $DIGNM | sed -n -e "s/^[-.a-z0-9]\{1,\}[ ]*\([0-9]*\) IN AA* ${ADDR_ESC}\$/\1/p"`
if test -z "$ADDR_TTL"; then if test -z "$ADDR_TTL"; then
setret "'dig $2' wrong; no address $ADDR record in $DIGNM" setret "'dig $2' wrong; no address $ADDR record in $DIGNM"
return 1 return 1
@@ -430,7 +430,7 @@ for mode in native dnsrps; do
continue continue
fi fi
echo_i "attempting to configure servers with DNSRPS..." echo_i "attempting to configure servers with DNSRPS..."
$PERL $SYSTEMTESTTOP/stop.pl rpz $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpz
$SHELL ./setup.sh -N -D $DEBUG $SHELL ./setup.sh -N -D $DEBUG
for server in ns*; do for server in ns*; do
resetstats $server resetstats $server
@@ -741,7 +741,7 @@ EOF
# restart the main test RPZ server to see if that creates a core file # restart the main test RPZ server to see if that creates a core file
if test -z "$HAVE_CORE"; then if test -z "$HAVE_CORE"; then
$PERL $SYSTEMTESTTOP/stop.pl rpz ns3 $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpz ns3
restart 3 restart 3
HAVE_CORE=`find ns* -name '*core*' -print` HAVE_CORE=`find ns* -name '*core*' -print`
test -z "$HAVE_CORE" || setret "found $HAVE_CORE; memory leak?" test -z "$HAVE_CORE" || setret "found $HAVE_CORE; memory leak?"