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

12
bin/tests/system/zonechecks/ns1/named.conf.in
View File

@@ -37,7 +37,7 @@ view unused {
match-clients { none; };
zone "duplicate.example" {
type master;
type primary;
file "duplicate.db";
};
};
@@ -45,26 +45,26 @@ view unused {
view primary {
match-clients { any; };
zone "master.example" {
zone "primary.example" {
type primary;
file "master.db";
file "primary.db";
allow-update { any; };
allow-transfer { any; };
auto-dnssec maintain;
};
zone "bigserial.example" {
type master;
type primary;
file "bigserial.db";
};
zone "reload.example" {
type master;
type primary;
file "reload.db";
};
zone "duplicate.example" {
type master;
type primary;
file "duplicate.db";
};
};

4
bin/tests/system/zonechecks/ns2/named.conf.in
View File

@@ -33,8 +33,8 @@ controls {
inet 10.53.0.2 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
zone "master.example" {
zone "primary.example" {
type secondary;
primaries { 10.53.0.1; };
file "slave.db";
file "sec.db";
};

12
bin/tests/system/zonechecks/setup.sh
View File

@@ -16,15 +16,15 @@ $SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/master.db
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/primary.db
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 > ns1/duplicate.db
cp bigserial.db ns1/
cd ns1
touch master.db.signed
echo '$INCLUDE "master.db.signed"' >> master.db
$KEYGEN -a rsasha256 -q master.example > /dev/null 2>&1
$KEYGEN -a rsasha256 -qfk master.example > /dev/null 2>&1
$SIGNER -SD -o master.example master.db > /dev/null \
touch primary.db.signed
echo '$INCLUDE "primary.db.signed"' >> primary.db
$KEYGEN -a rsasha256 -q primary.example > /dev/null 2>&1
$KEYGEN -a rsasha256 -qfk primary.example > /dev/null 2>&1
$SIGNER -SD -o primary.example primary.db > /dev/null \
2> signer.err || cat signer.err
echo '$INCLUDE "soa.db"' > reload.db
echo '@ 0 NS .' >> reload.db

52
bin/tests/system/zonechecks/tests.sh
View File

@@ -161,8 +161,8 @@ echo_i "checking 'rdnc zonestatus' output"
ret=0
for i in 0 1 2 3 4 5 6 7 8 9
do
$RNDCCMD 10.53.0.1 zonestatus master.example > rndc.out.master 2>&1
grep "zone not loaded" rndc.out.master > /dev/null || break
$RNDCCMD 10.53.0.1 zonestatus primary.example > rndc.out.pri 2>&1
grep "zone not loaded" rndc.out.pri > /dev/null || break
sleep 1
done
checkfor() {
@@ -171,34 +171,34 @@ checkfor() {
echo_i "missing string '$1' from '$2'"
}
}
checkfor "name: master.example" rndc.out.master
checkfor "type: master" rndc.out.master
checkfor "files: master.db, master.db.signed" rndc.out.master
checkfor "serial: " rndc.out.master
checkfor "nodes: " rndc.out.master
checkfor "last loaded: " rndc.out.master
checkfor "secure: yes" rndc.out.master
checkfor "inline signing: no" rndc.out.master
checkfor "key maintenance: automatic" rndc.out.master
checkfor "next key event: " rndc.out.master
checkfor "next resign node: " rndc.out.master
checkfor "next resign time: " rndc.out.master
checkfor "dynamic: yes" rndc.out.master
checkfor "frozen: no" rndc.out.master
checkfor "name: primary.example" rndc.out.pri
checkfor "type: primary" rndc.out.pri
checkfor "files: primary.db, primary.db.signed" rndc.out.pri
checkfor "serial: " rndc.out.pri
checkfor "nodes: " rndc.out.pri
checkfor "last loaded: " rndc.out.pri
checkfor "secure: yes" rndc.out.pri
checkfor "inline signing: no" rndc.out.pri
checkfor "key maintenance: automatic" rndc.out.pri
checkfor "next key event: " rndc.out.pri
checkfor "next resign node: " rndc.out.pri
checkfor "next resign time: " rndc.out.pri
checkfor "dynamic: yes" rndc.out.pri
checkfor "frozen: no" rndc.out.pri
for i in 0 1 2 3 4 5 6 7 8 9
do
$RNDCCMD 10.53.0.2 zonestatus master.example > rndc.out.slave 2>&1
grep "zone not loaded" rndc.out.slave > /dev/null || break
$RNDCCMD 10.53.0.2 zonestatus primary.example > rndc.out.sec 2>&1
grep "zone not loaded" rndc.out.sec > /dev/null || break
sleep 1
done
checkfor "name: master.example" rndc.out.slave
checkfor "type: slave" rndc.out.slave
checkfor "files: slave.db" rndc.out.slave
checkfor "serial: " rndc.out.slave
checkfor "nodes: " rndc.out.slave
checkfor "next refresh: " rndc.out.slave
checkfor "expires: " rndc.out.slave
checkfor "secure: yes" rndc.out.slave
checkfor "name: primary.example" rndc.out.sec
checkfor "type: secondary" rndc.out.sec
checkfor "files: sec.db" rndc.out.sec
checkfor "serial: " rndc.out.sec
checkfor "nodes: " rndc.out.sec
checkfor "next refresh: " rndc.out.sec
checkfor "expires: " rndc.out.sec
checkfor "secure: yes" rndc.out.sec
for i in 0 1 2 3 4 5 6 7 8 9
do
$RNDCCMD 10.53.0.1 zonestatus reload.example > rndc.out.prereload 2>&1