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.

bin/tests/system/acl/ns2/named1.conf.in

@@ -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; };
 };

bin/tests/system/acl/ns2/named2.conf.in

@@ -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

bin/tests/system/acl/ns2/named3.conf.in

@@ -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; };
 };

bin/tests/system/acl/ns2/named4.conf.in

@@ -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; };
 };

bin/tests/system/acl/ns2/named5.conf.in

@@ -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; };
 };

bin/tests/system/acl/ns4/named.conf.in

@@ -33,6 +33,6 @@ key rndc_key {
 };
 
 zone "existing" {
-	type master;
+	type primary;
 	file "existing.db";
 };

bin/tests/system/acl/tests.sh

@@ -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`