Commit e43b3c1f authored by Evan Hunt's avatar Evan Hunt
Browse files

further tidying of primary/secondary terminology in system tests

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.
parent 68c384e1
......@@ -48,12 +48,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !key one; any; };
};
......@@ -48,12 +48,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
/*
* 0a00::/8 and 10/8 are the same bits, but different address
......
......@@ -61,12 +61,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !reject; accept; };
};
......@@ -60,12 +60,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !rejectkeys; !rejectaddrs; !check1; !check2; any; };
};
......@@ -50,12 +50,12 @@ zone "." {
};
zone "example" {
type master;
type primary;
file "example.db";
};
zone "tsigzone" {
type master;
type primary;
file "tsigzone.db";
allow-transfer { !key one; any; };
};
......@@ -33,6 +33,6 @@ key rndc_key {
};
zone "existing" {
type master;
type primary;
file "existing.db";
};
......@@ -168,7 +168,7 @@ status=`expr $status + $ret`
echo_i "testing allow-transfer ACLs against ns3 (no existing zones)"
echo_i "calling addzone example.com on ns3"
$RNDCCMD 10.53.0.3 addzone 'example.com {type master; file "example.db"; }; '
$RNDCCMD 10.53.0.3 addzone 'example.com {type primary; file "example.db"; }; '
sleep 1
t=`expr $t + 1`
......@@ -197,7 +197,7 @@ status=`expr $status + $ret`
echo_i "testing allow-transfer ACLs against ns4 (1 pre-existing zone)"
echo_i "calling addzone example.com on ns4"
$RNDCCMD 10.53.0.4 addzone 'example.com {type master; file "example.db"; }; '
$RNDCCMD 10.53.0.4 addzone 'example.com {type primary; file "example.db"; }; '
sleep 1
t=`expr $t + 1`
......
......@@ -30,31 +30,31 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};
......@@ -30,31 +30,31 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};
......@@ -31,31 +31,31 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};
......@@ -30,41 +30,41 @@ controls {
};
zone "." {
type master;
type primary;
file "root.db";
};
zone "mx.example" {
type master;
type primary;
file "mx.db";
};
zone "srv.example" {
type master;
type primary;
file "srv.db";
};
zone "rt.example" {
type master;
type primary;
file "rt.db";
};
zone "naptr.example" {
type master;
type primary;
file "naptr.db";
};
zone "rt2.example" {
type master;
type primary;
file "rt2.db";
};
zone "naptr2.example" {
type master;
type primary;
file "naptr2.db";
};
zone "nid.example" {
type master;
type primary;
file "nid.db";
};
......@@ -23,6 +23,6 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
};
......@@ -30,11 +30,11 @@ zone "." {
};
zone "ex" {
type master;
type primary;
file "ex.db";
};
zone "ex2" {
type master;
type primary;
file "ex2.db";
};
......@@ -24,7 +24,7 @@ rm -f ./ns3/*.nzd ./ns3/*.nzd-lock
rm -f ./ns2/core*
rm -f ./ns2/inline.db.jbk
rm -f ./ns2/inline.db.signed
rm -f ./ns2/inlineslave.bk*
rm -f ./ns2/inlinesec.bk*
rm -rf ./ns2/new-zones
rm -f ./ns*/named.lock
rm -f ./ns*/named.run ./ns*/named.run.prev
......@@ -32,7 +32,7 @@ rm -f ./ns2/nzf-*
rm -f ./ns3/named.conf
rm -f ./ns3/*.nzf ./ns3/*.nzf~
rm -f ./ns3/*.nzd ns3/*.nzd-lock
rm -f ./ns3/inlineslave.db
rm -f ./ns3/inlinesec.db
rm -f ./ns1/redirect.db
rm -f ./ns2/redirect.db
rm -f ./ns2/redirect.bk
......
......@@ -7,7 +7,7 @@
; See the COPYRIGHT file distributed with this work for additional
; information regarding copyright ownership.
$ORIGIN inlineslave.example.
$ORIGIN inlinesec.example.
$TTL 300 ; 5 minutes
@ IN SOA mname1. . (
1 ; serial
......
......@@ -33,9 +33,9 @@ zone "." {
file "../../common/root.hint";
};
zone "inlineslave.example" {
type master;
file "inlineslave.db";
zone "inlinesec.example" {
type primary;
file "inlinesec.db";
};
zone "." {
......
zone previous.example { type master; file "previous.db"; };
zone previous.example { type primary; file "previous.db"; };
......@@ -31,11 +31,11 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "normal.db";
};
zone "finaldot.example." {
type master;
type primary;
file "normal.db";
};
......@@ -37,7 +37,7 @@ view internal {
};
zone "policy" {
type master;
type primary;
file "normal.db";
};
};
......
......@@ -37,7 +37,7 @@ view internal {
};
zone "policy" {
type master;
type primary;
file "normal.db";
};
};
......
......@@ -26,10 +26,10 @@ options {
};
zone "." {
type master;
type primary;
file "redirect.db";
};
primaries "testmaster" {
primaries "test" {
192.5.5.241;
};
This diff is collapsed.
......@@ -18,6 +18,6 @@ options {
};
zone "." {
type master;
type primary;
file "root.db";
};
......@@ -25,6 +25,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -26,6 +26,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -28,6 +28,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -28,6 +28,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -28,6 +28,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -31,6 +31,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -37,6 +37,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -31,6 +31,6 @@ zone "." {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......@@ -27,7 +27,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};
......@@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......
......@@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};
......@@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};
......@@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};
......@@ -29,7 +29,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};
......@@ -31,7 +31,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
......
......@@ -31,7 +31,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};
......@@ -31,7 +31,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};
......@@ -34,7 +34,7 @@ view "internal" {
};
zone "normal.example" {
type master;
type primary;
file "generic.db";
};
};