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

4
bin/tests/system/upforwd/ns1/named.conf.in
View File

@@ -27,13 +27,13 @@ options {
};
zone "example" {
type master;
type primary;
file "example.db";
allow-update { key update.example.; 10.53.0.3; };
};
zone "example2" {
type master;
type primary;
file "example2.db";
allow-update { key sig0.example2.; };
};

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

@@ -22,13 +22,13 @@ options {
};
zone "example" {
type slave;
type secondary;
file "example.bk";
primaries { 10.53.0.1; };
};
zone "example2" {
type slave;
type secondary;
file "example2.bk";
primaries { 10.53.0.1; };
};

6
bin/tests/system/upforwd/ns3/named.conf.in
View File

@@ -22,21 +22,21 @@ options {
};
zone "example" {
type slave;
type secondary;
file "example.bk";
allow-update-forwarding { any; };
primaries { 10.53.0.1; };
};
zone "example2" {
type slave;
type secondary;
file "example2.bk";
allow-update-forwarding { any; };
primaries { 10.53.0.1; };
};
zone "nomaster" {
type slave;
type secondary;
file "nomaster1.db";
allow-update-forwarding { any; };
masterfile-format text;

26
bin/tests/system/upforwd/tests.sh
View File

@@ -9,9 +9,9 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
# ns1 = stealth master
# ns2 = slave with update forwarding disabled; not currently used
# ns3 = slave with update forwarding enabled
# ns1 = stealth primary
# ns2 = secondary with update forwarding disabled; not currently used
# ns3 = secondary with update forwarding enabled
. $SYSTEMTESTTOP/conf.sh
@@ -36,20 +36,20 @@ done
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
n=`expr $n + 1`
echo_i "fetching master copy of zone before update ($n)"
echo_i "fetching primary copy of zone before update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.1 axfr > dig.out.ns1 || ret=1
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
n=`expr $n + 1`
echo_i "fetching slave 1 copy of zone before update ($n)"
echo_i "fetching secondary 1 copy of zone before update ($n)"
$DIG $DIGOPTS example.\
@10.53.0.2 axfr > dig.out.ns2 || ret=1
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
n=`expr $n + 1`
echo_i "fetching slave 2 copy of zone before update ($n)"
echo_i "fetching secondary 2 copy of zone before update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.3 axfr > dig.out.ns3 || ret=1
@@ -77,20 +77,20 @@ n=`expr $n + 1`
echo_i "sleeping 15 seconds for server to incorporate changes"
sleep 15
echo_i "fetching master copy of zone after update ($n)"
echo_i "fetching primary copy of zone after update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.1 axfr > dig.out.ns1 || ret=1
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
n=`expr $n + 1`
echo_i "fetching slave 1 copy of zone after update ($n)"
echo_i "fetching secondary 1 copy of zone after update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.2 axfr > dig.out.ns2 || ret=1
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
echo_i "fetching slave 2 copy of zone after update ($n)"
echo_i "fetching secondary 2 copy of zone after update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.3 axfr > dig.out.ns3 || ret=1
@@ -124,20 +124,20 @@ n=`expr $n + 1`
echo_i "sleeping 15 seconds for server to incorporate changes"
sleep 15
echo_i "fetching master copy of zone after update ($n)"
echo_i "fetching primary copy of zone after update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.1 axfr > dig.out.ns1 || ret=1
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
echo_i "fetching slave 1 copy of zone after update ($n)"
echo_i "fetching secondary 1 copy of zone after update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.2 axfr > dig.out.ns2 || ret=1
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
n=`expr $n + 1`
echo_i "fetching slave 2 copy of zone after update ($n)"
echo_i "fetching secondary 2 copy of zone after update ($n)"
ret=0
$DIG $DIGOPTS example.\
@10.53.0.3 axfr > dig.out.ns3 || ret=1
@@ -151,7 +151,7 @@ digcomp knowngood.after2 dig.out.ns3 || ret=1
if [ $ret != 0 ] ; then echo_i "failed"; status=`expr $status + $ret`; fi
n=`expr $n + 1`
echo_i "checking update forwarding to dead master ($n)"
echo_i "checking update forwarding to dead primary ($n)"
count=0
ret=0
while [ $count -lt 5 -a $ret -eq 0 ]