ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

further tidying of primary/secondary terminology in system tests

Browse Source 
this changes most visble uses of master/slave terminology in tests.sh
and most uses of 'type master' or 'type slave' in named.conf files.
files in the checkconf test were not updated in order to confirm that
the old syntax still works. rpzrecurse was also left mostly unchanged
to avoid interference with DNSRPS.
This commit is contained in:
Evan Hunt
2020-06-30 13:10:59 -07:00
parent 68c384e118
commit e43b3c1fa1
336 changed files with 1478 additions and 1465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/tests/system/nsupdate/ns1/named.conf.in
View File

@@ -40,7 +40,7 @@ key altkey {
include "ddns.key";
zone "example.nil" {
type master;
type primary;
file "example.db";
check-integrity no;
check-mx ignore;
@@ -51,7 +51,7 @@ zone "example.nil" {
};
zone "max-ttl.nil" {
type master;
type primary;
file "max-ttl.db";
max-zone-ttl 300;
check-integrity no;
@@ -60,7 +60,7 @@ zone "max-ttl.nil" {
};
zone "other.nil" {
type master;
type primary;
file "other.db";
check-integrity no;
check-mx warn;
@@ -75,7 +75,7 @@ primaries others {
};
zone "update.nil" {
type master;
type primary;
file "update.db";
check-integrity no;
check-mx fail;
@@ -85,7 +85,7 @@ zone "update.nil" {
};
zone "unixtime.nil" {
type master;
type primary;
file "unixtime.db";
check-integrity no;
allow-update { any; };
@@ -94,7 +94,7 @@ zone "unixtime.nil" {
};
zone "yyyymmddvv.nil" {
type master;
type primary;
file "yyyymmddvv.db";
check-integrity no;
allow-update { any; };
@@ -110,7 +110,7 @@ include "sha384.key";
include "sha512.key";
zone "keytests.nil" {
type master;
type primary;
file "keytests.db";
update-policy {
grant md5-key name md5.keytests.nil. ANY;
@@ -123,19 +123,19 @@ zone "keytests.nil" {
};
zone "many.test" {
type master;
type primary;
allow-update { any; };
file "many.test.db";
};
zone "sample" {
type master;
type primary;
allow-update { any; };
file "sample.db";
};
zone "maxjournal.test" {
type master;
type primary;
allow-update { any; };
file "maxjournal.db";
max-journal-size default;

4
bin/tests/system/nsupdate/ns10/named.conf.in
View File

@@ -33,13 +33,13 @@ controls {
};
zone "in-addr.arpa" {
type master;
type primary;
file "in-addr.db";
update-policy { grant EXAMPLE.COM ms-subdomain . PTR; };
};
zone "example.com" {
type master;
type primary;
file "example.com.db";
update-policy {
grant EXAMPLE.COM ms-selfsub . ANY;

8
bin/tests/system/nsupdate/ns2/named.conf.in
View File

@@ -40,7 +40,7 @@ view alternate {
match-clients { key altkey; };
zone "update.nil" {
type slave;
type secondary;
primaries { 10.53.0.1; };
file "update.alt.bk";
allow-transfer { any; };
@@ -51,21 +51,21 @@ view primary {
match-clients { any; };
zone "example.nil" {
type slave;
type secondary;
primaries { 10.53.0.1; };
file "example.bk";
allow-transfer { any; };
};
zone "update.nil" {
type slave;
type secondary;
primaries { 10.53.0.1; };
file "update.bk";
allow-transfer { any; };
};
zone "sample" {
type master;
type primary;
allow-update { any; };
file "sample.db";
};

12
bin/tests/system/nsupdate/ns3/named.conf.in
View File

@@ -25,38 +25,38 @@ options {
};
zone "example" {
type master;
type primary;
allow-update { any; };
file "example.db";
};
zone "nsec3param.test" {
type master;
type primary;
allow-update { any; };
file "nsec3param.test.db.signed";
};
zone "dnskey.test" {
type master;
type primary;
allow-update { any; };
file "dnskey.test.db.signed";
};
zone "many.test" {
type slave;
type secondary;
primaries { 10.53.0.1; };
allow-update-forwarding { any; };
file "many.test.bk";
};
zone "delegation.test" {
type master;
type primary;
allow-update { any; };
file "delegation.test.db.signed";
};
zone "too-big.test" {
type master;
type primary;
allow-update { any; };
max-records 3;
file "too-big.test.db";

2
bin/tests/system/nsupdate/ns5/named.conf.in
View File

@@ -32,7 +32,7 @@ controls {
};
zone "local.nil" {
type master;
type primary;
file "local.db";
update-policy local;
};

2
bin/tests/system/nsupdate/ns6/named.conf.in
View File

@@ -32,7 +32,7 @@ controls {
};
zone "in-addr.arpa" {
type master;
type primary;
file "in-addr.db";
update-policy { grant * tcp-self . PTR(1) ANY(2) A; };
};

4
bin/tests/system/nsupdate/ns7/named.conf.in
View File

@@ -33,13 +33,13 @@ controls {
};
zone "in-addr.arpa" {
type master;
type primary;
file "in-addr.db";
update-policy { grant EXAMPLE.COM krb5-subdomain . PTR; };
};
zone "example.com" {
type master;
type primary;
file "example.com.db";
update-policy {
grant EXAMPLE.COM krb5-self . ANY;

4
bin/tests/system/nsupdate/ns8/named.conf.in
View File

@@ -33,13 +33,13 @@ controls {
};
zone "in-addr.arpa" {
type master;
type primary;
file "in-addr.db";
update-policy { grant EXAMPLE.COM krb5-subdomain . PTR; };
};
zone "example.com" {
type master;
type primary;
file "example.com.db";
update-policy {
grant EXAMPLE.COM krb5-selfsub . ANY;

4
bin/tests/system/nsupdate/ns9/named.conf.in
View File

@@ -33,13 +33,13 @@ controls {
};
zone "in-addr.arpa" {
type master;
type primary;
file "in-addr.db";
update-policy { grant EXAMPLE.COM ms-subdomain . PTR; };
};
zone "example.com" {
type master;
type primary;
file "example.com.db";
update-policy {
grant EXAMPLE.COM ms-self . ANY;

18
bin/tests/system/nsupdate/tests.sh
View File

@@ -362,7 +362,7 @@ digcomp dig.out.ns1 dig.out.ns1.after || ret=1
echo_i "begin RT #482 regression test"
ret=0
echo_i "update master"
echo_i "update primary"
$NSUPDATE -k ns1/ddns.key <<END > /dev/null || ret=1
server 10.53.0.1 ${PORT}
update add updated2.example.nil. 600 A 10.10.10.2
@@ -375,17 +375,17 @@ END
sleep 5
if [ ! "$CYGWIN" ]; then
echo_i "SIGHUP slave"
echo_i "SIGHUP secondary"
$KILL -HUP `cat ns2/named.pid`
else
echo_i "reload slave"
echo_i "reload secondary"
rndc_reload ns2 10.53.0.2
fi
sleep 5
ret=0
echo_i "update master again"
echo_i "update primary again"
$NSUPDATE -k ns1/ddns.key <<END > /dev/null || ret=1
server 10.53.0.1 ${PORT}
update add updated3.example.nil. 600 A 10.10.10.3
@@ -398,10 +398,10 @@ END
sleep 5
if [ ! "$CYGWIN" ]; then
echo_i "SIGHUP slave again"
echo_i "SIGHUP secondary again"
$KILL -HUP `cat ns2/named.pid`
else
echo_i "reload slave again"
echo_i "reload secondary again"
rndc_reload ns2 10.53.0.2
fi
@@ -508,7 +508,7 @@ if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $ret + $status`; fi
ret=0
echo_i "testing that rndc stop updates the master file"
echo_i "testing that rndc stop updates the file"
$NSUPDATE -k ns1/ddns.key <<END > /dev/null || ret=1
server 10.53.0.1 ${PORT}
update add updated4.example.nil. 600 A 10.10.10.3
@@ -519,7 +519,7 @@ $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} nsupdate ns1
sleep 3
# Removing the journal file and restarting the server means
# that the data served by the new server process are exactly
# those dumped to the master file by "rndc stop".
# those dumped to the file by "rndc stop".
rm -f ns1/*jnl
start_server --noclean --restart --port ${PORT} nsupdate ns1
for try in 0 1 2 3 4 5 6 7 8 9; do
@@ -924,7 +924,7 @@ grep "records in zone (4) exceeds max-records (3)" ns3/named.run > /dev/null ||
n=`expr $n + 1`
ret=0
echo_i "check whether valid addresses are used for master failover ($n)"
echo_i "check whether valid addresses are used for primary failover ($n)"
$NSUPDATE -t 1 <<END > nsupdate.out-$n 2>&1 && ret=1
server 10.53.0.4 ${PORT}
zone unreachable.