upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-04-21 22:28:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[rt46602] Miscellaneous changes to fix rebase issues

Browse source
This commit is contained in:
Stephen Morris 2018-02-15 15:58:38 +00:00
parent 30cd931a0d
commit 7222c9fc76
5 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/tests/system/rpzrecurse/.gitignore vendored
View file

@ -2,6 +2,7 @@
/ns2/named.conf.header
/ns2/named.conf
/ns3/named.conf
/ns3/named2.conf
/ns4/named.conf
/ans5/ans.pl
/ans5/ans.pid

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

@ -19,6 +19,8 @@ rm -f ns2/*.queries
rm -f ns2/named.[0-9]*.conf
rm -f ns2/named.conf.header
rm -f ns3/named2.conf
rm -f ans4/ans.pl
rm -f dnsrps*.conf dnsrpzd*

2
bin/tests/system/rpzrecurse/ns1/named.conf.in
View file

@ -25,7 +25,7 @@ key rndc_key {
};
controls {
inet 10.53.0.1 port 9953 allow { any; } keys { rndc_key; };
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
zone "." {

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

@ -40,6 +40,7 @@ copy_setports ns2/named.conf.header.in ns2/named.conf.header
copy_setports ns2/named.default.conf ns2/named.conf
copy_setports ns3/named1.conf.in ns3/named.conf
copy_setports ns3/named2.conf.in ns3/named2.conf
copy_setports ns4/named.conf.in ns4/named.conf

2
bin/tests/system/rpzrecurse/tests.sh
View file

@ -51,7 +51,7 @@ run_server() {
echo_i "starting resolver using named.$TESTNAME.conf"
cp -f ns2/named.$TESTNAME.conf ns2/named.conf
$PERL $SYSTEMTESTTOP/start.pl --noclean --restart . ns2
$PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} . ns2
sleep 3
}