From f3d3a4ff6e96f52b059b3ade3b44fe9f54b8b8b6 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Tue, 5 Oct 2021 10:41:27 +0200 Subject: [PATCH] Replace "master/slave" terminology in tests Replace most "master/slave" terminology in tests with the preferred "primary/secondary", with the following exceptions: - When testing the old syntax - When master is used in master file and master file format terms - When master is used in hostmaster or postmaster terms - When master used in legacy domain names (for example in dig.batch) - When there is no replacement (for example default-masters) --- bin/tests/named.conf | 38 ++--- bin/tests/startperf/setup.sh | 4 +- bin/tests/system/README | 2 +- .../system/addzone/tests_rndc_deadlock.py | 4 +- bin/tests/system/catz/tests.sh | 40 +++--- bin/tests/system/checkconf/altdb.conf | 2 +- bin/tests/system/checkconf/altdlz.conf | 2 +- .../system/checkconf/bad-also-notify.conf | 4 +- bin/tests/system/checkconf/bad-dnssec.conf | 8 +- .../system/checkconf/bad-in-view-dup.conf | 4 +- ...e-slave.conf => bad-inline-secondary.conf} | 8 +- .../checkconf/bad-kasp-define-default.conf | 2 +- .../checkconf/bad-kasp-define-insecure.conf | 2 +- .../checkconf/bad-kasp-define-none.conf | 2 +- bin/tests/system/checkconf/bad-kasp-key1.conf | 2 +- bin/tests/system/checkconf/bad-kasp-key2.conf | 2 +- bin/tests/system/checkconf/bad-kasp-key3.conf | 2 +- bin/tests/system/checkconf/bad-kasp-key4.conf | 2 +- bin/tests/system/checkconf/bad-kasp10.conf | 4 +- bin/tests/system/checkconf/bad-kasp11.conf | 4 +- bin/tests/system/checkconf/bad-kasp12.conf | 4 +- bin/tests/system/checkconf/bad-kasp13.conf | 4 +- bin/tests/system/checkconf/bad-kasp2.conf | 2 +- bin/tests/system/checkconf/bad-kasp3.conf | 2 +- bin/tests/system/checkconf/bad-kasp4.conf | 2 +- bin/tests/system/checkconf/bad-kasp6.conf | 4 +- bin/tests/system/checkconf/bad-kasp7.conf | 4 +- bin/tests/system/checkconf/bad-kasp8.conf | 4 +- bin/tests/system/checkconf/bad-kasp9.conf | 4 +- .../checkconf/bad-master-request-ixfr.conf | 4 +- bin/tests/system/checkconf/bad-maxratio1.conf | 2 +- bin/tests/system/checkconf/bad-maxratio2.conf | 2 +- .../bad-mirror-allow-recursion-none.conf | 2 +- bin/tests/system/checkconf/bad-noddns.conf | 2 +- .../checkconf/bad-options-also-notify.conf | 4 +- ...asters-dup.conf => bad-primaries-dup.conf} | 0 .../checkconf/bad-rpz-too-many-zones.conf | 130 +++++++++--------- bin/tests/system/checkconf/bad-rpz-ttl.conf | 2 +- .../system/checkconf/bad-rpz-update.conf | 2 +- .../system/checkconf/bad-sharedwritable1.conf | 6 +- .../system/checkconf/bad-sharedwritable2.conf | 8 +- .../system/checkconf/bad-sharedzone1.conf | 4 +- .../system/checkconf/bad-sharedzone2.conf | 4 +- .../system/checkconf/bad-sharedzone3.conf | 2 +- .../checkconf/bad-stub-masters-dialup.conf | 2 +- .../system/checkconf/bad-update-policy1.conf | 2 +- .../system/checkconf/bad-update-policy10.conf | 2 +- .../system/checkconf/bad-update-policy11.conf | 2 +- .../system/checkconf/bad-update-policy12.conf | 2 +- .../system/checkconf/bad-update-policy13.conf | 2 +- .../system/checkconf/bad-update-policy14.conf | 2 +- .../system/checkconf/bad-update-policy15.conf | 2 +- .../system/checkconf/bad-update-policy16.conf | 2 +- .../system/checkconf/bad-update-policy2.conf | 2 +- .../system/checkconf/bad-update-policy3.conf | 2 +- .../system/checkconf/bad-update-policy4.conf | 2 +- .../system/checkconf/bad-update-policy5.conf | 2 +- .../system/checkconf/bad-update-policy6.conf | 2 +- .../system/checkconf/bad-update-policy7.conf | 2 +- .../system/checkconf/bad-update-policy8.conf | 2 +- .../system/checkconf/bad-update-policy9.conf | 2 +- .../checkconf/bad-view-also-notify.conf | 4 +- .../checkconf/check-dup-records-fail.conf | 2 +- .../system/checkconf/check-missing-zone.conf | 4 +- .../system/checkconf/check-mx-cname-fail.conf | 2 +- bin/tests/system/checkconf/check-mx-fail.conf | 2 +- .../system/checkconf/check-names-fail.conf | 2 +- .../checkconf/check-srv-cname-fail.conf | 2 +- bin/tests/system/checkconf/dlz-bad.conf | 4 +- bin/tests/system/checkconf/good-kasp.conf | 10 +- .../system/checkconf/good-maxratio1.conf | 2 +- .../system/checkconf/good-maxratio2.conf | 2 +- .../checkconf/good-options-also-notify.conf | 4 +- .../system/checkconf/good-response-dot.conf | 2 +- bin/tests/system/checkconf/good-rpz-ttl.conf | 2 +- .../system/checkconf/good-rpz-update.conf | 2 +- .../checkconf/good-sig-signing-type.conf | 2 +- .../system/checkconf/good-update-policy1.conf | 2 +- .../checkconf/good-update-policy10.conf | 2 +- .../checkconf/good-update-policy11.conf | 2 +- .../checkconf/good-update-policy12.conf | 2 +- .../checkconf/good-update-policy13.conf | 2 +- .../system/checkconf/good-update-policy2.conf | 2 +- .../system/checkconf/good-update-policy3.conf | 2 +- .../system/checkconf/good-update-policy4.conf | 2 +- .../system/checkconf/good-update-policy5.conf | 2 +- .../system/checkconf/good-update-policy6.conf | 2 +- .../system/checkconf/good-update-policy7.conf | 2 +- .../system/checkconf/good-update-policy8.conf | 2 +- .../system/checkconf/good-update-policy9.conf | 2 +- .../checkconf/good-view-also-notify.conf | 4 +- bin/tests/system/checkconf/good.conf | 38 ++--- bin/tests/system/checkconf/good.zonelist | 34 ++--- bin/tests/system/checkconf/in-view-good.conf | 2 +- bin/tests/system/checkconf/inline-bad.conf | 10 +- bin/tests/system/checkconf/inline-good.conf | 10 +- bin/tests/system/checkconf/inline-no.conf | 10 +- .../kasp-and-other-dnssec-options.conf | 2 +- .../system/checkconf/kasp-bad-keylen.conf | 2 +- .../system/checkconf/kasp-bad-nsec3-alg.conf | 2 +- .../system/checkconf/kasp-bad-nsec3-iter.conf | 2 +- .../system/checkconf/kasp-bad-nsec3-salt.conf | 2 +- .../system/checkconf/kasp-ignore-keylen.conf | 2 +- bin/tests/system/checkconf/max-ttl.conf | 6 +- bin/tests/system/checkconf/maxttl-bad.conf | 2 +- bin/tests/system/checkconf/notify.conf | 46 +++---- bin/tests/system/checkconf/range.conf | 2 +- bin/tests/system/checkconf/warn-keydir.conf | 2 +- .../system/checkconf/warn-maxratio1.conf | 2 +- bin/tests/system/ckdnsrps.sh | 18 +-- bin/tests/system/delzone/ns2/named.conf | 2 +- bin/tests/system/delzone/tests.sh | 2 +- bin/tests/system/dialup/ns1/named.conf | 4 +- bin/tests/system/dialup/ns2/named.conf | 4 +- bin/tests/system/dialup/ns3/named.conf | 4 +- bin/tests/system/dns64/ns1/named.conf1.in | 2 +- bin/tests/system/dns64/ns1/named.conf2.in | 2 +- bin/tests/system/dns64/ns1/named.conf3.in | 2 +- bin/tests/system/dnssec/ns2/named.conf.in | 4 +- bin/tests/system/genzone.sh | 8 +- bin/tests/system/inline/ns1/root.db.in | 4 +- bin/tests/system/inline/ns3/named.conf.in | 4 +- .../ns3/{master.db.in => primary.db.in} | 0 .../ns3/{master2.db.in => primary2.db.in} | 0 .../ns3/{master3.db.in => primary3.db.in} | 0 .../ns3/{master4.db.in => primary4.db.in} | 0 .../ns3/{master5.db.in => primary5.db.in} | 0 .../ns3/{master6.db.in => primary6.db.in} | 0 .../ns3/{master7.db.in => primary7.db.in} | 0 bin/tests/system/inline/ns3/sign.sh | 4 +- bin/tests/system/inline/setup.sh | 18 +-- bin/tests/system/inline/tests.sh | 64 ++++----- bin/tests/system/kasp/ns3/named.conf.in | 4 +- bin/tests/system/kasp/ns6/named.conf.in | 6 +- bin/tests/system/kasp/ns6/named2.conf.in | 10 +- .../system/keymgr2kasp/ns4/named.conf.in | 4 +- .../system/keymgr2kasp/ns4/named2.conf.in | 4 +- bin/tests/system/notify/tests.sh | 4 +- bin/tests/system/nsupdate/ns9/named.conf.in | 2 +- bin/tests/system/nzd2nzf/tests.sh | 4 +- bin/tests/system/redirect/conf/good2.conf | 4 +- bin/tests/system/rpz/dnsrpzd-license.conf | 2 +- bin/tests/system/rpz/dnsrpzd.conf.in | 32 ++--- bin/tests/system/rpz/ns5/named.conf.in | 2 +- bin/tests/system/rpz/ns6/named.conf.in | 2 +- bin/tests/system/rpz/ns7/named.conf.in | 2 +- bin/tests/system/rpz/setup.sh | 2 +- bin/tests/system/rpzrecurse/.gitignore | 2 +- bin/tests/system/rpzrecurse/ns1/named.conf.in | 16 +-- .../system/rpzrecurse/ns2/named.clientip.conf | 4 +- .../rpzrecurse/ns2/named.clientip2.conf | 2 +- .../rpzrecurse/ns2/named.conf.header.in | 2 +- .../ns2/named.invalidprefixlength.conf | 2 +- .../system/rpzrecurse/ns2/named.log.conf | 6 +- .../system/rpzrecurse/ns2/named.max.conf | 128 ++++++++--------- .../rpzrecurse/ns2/named.wildcard1.conf | 2 +- .../rpzrecurse/ns2/named.wildcard2.conf | 4 +- .../rpzrecurse/ns2/named.wildcard3.conf | 2 +- .../rpzrecurse/ns2/named.wildcard4.conf | 4 +- .../system/rpzrecurse/ns3/named1.conf.in | 6 +- .../system/rpzrecurse/ns3/named2.conf.in | 6 +- .../system/rpzrecurse/ns3/named3.conf.in | 6 +- bin/tests/system/rpzrecurse/ns4/named.conf.in | 2 +- bin/tests/system/rpzrecurse/setup.sh | 4 +- bin/tests/system/rpzrecurse/testgen.pl | 2 +- bin/tests/system/shutdown/ns1/named.conf.in | 2 +- bin/tests/system/shutdown/ns2/named.conf.in | 2 +- bin/tests/system/staticstub/conf/bad09.conf | 4 +- bin/tests/system/staticstub/setup.sh | 2 +- bin/tests/system/staticstub/tests.sh | 2 +- bin/tests/system/stress/ns1/named.conf | 2 +- bin/tests/system/stress/setup.pl | 11 +- bin/tests/system/stub/ns5/named.conf.in | 2 +- bin/tests/system/stub/tests.sh | 4 +- bin/tests/system/upforwd/clean.sh | 2 +- bin/tests/system/upforwd/ns3/named.conf.in | 4 +- .../upforwd/ns3/{nomaster.db => noprimary.db} | 0 bin/tests/system/upforwd/setup.sh | 2 +- bin/tests/system/upforwd/tests.sh | 8 +- bin/tests/system/views/tests.sh | 2 +- fuzz/isc_lex_gettoken.in/named.conf | 36 ++--- lib/isccfg/tests/parser_test.c | 14 +- 182 files changed, 580 insertions(+), 579 deletions(-) rename bin/tests/system/checkconf/{bad-inline-slave.conf => bad-inline-secondary.conf} (77%) rename bin/tests/system/checkconf/{bad-masters-dup.conf => bad-primaries-dup.conf} (100%) rename bin/tests/system/inline/ns3/{master.db.in => primary.db.in} (100%) rename bin/tests/system/inline/ns3/{master2.db.in => primary2.db.in} (100%) rename bin/tests/system/inline/ns3/{master3.db.in => primary3.db.in} (100%) rename bin/tests/system/inline/ns3/{master4.db.in => primary4.db.in} (100%) rename bin/tests/system/inline/ns3/{master5.db.in => primary5.db.in} (100%) rename bin/tests/system/inline/ns3/{master6.db.in => primary6.db.in} (100%) rename bin/tests/system/inline/ns3/{master7.db.in => primary7.db.in} (100%) rename bin/tests/system/upforwd/ns3/{nomaster.db => noprimary.db} (100%) diff --git a/bin/tests/named.conf b/bin/tests/named.conf index 6a5f6543ff..cb77397ecd 100644 --- a/bin/tests/named.conf +++ b/bin/tests/named.conf @@ -90,7 +90,7 @@ options { // forwarding behavior, i.e. ask the forwarders first, and if that // doesn't work then do the full lookup. You can also say // "forward only;" which is what used to be specified with - // "slave" or "options forward-only". "only" will never attempt + // "secondary" or "options forward-only". "only" will never attempt // a full lookup; only the forwarders will be used. forward first; forwarders { @@ -98,8 +98,8 @@ options { 5.6.7.8; }; - check-names master fail; - check-names slave warn; + check-names primary fail; + check-names secondary warn; check-names response ignore; allow-query { any; }; @@ -209,10 +209,10 @@ controls { inet 10.0.0.2 allow { none; }; }; -zone "master.demo.zone" { - type master; // what used to be called "primary" +zone "primary.demo.zone" { + type primary; // what used to be called "primary" database "somedb -option1 -option2 arg1 arg2 arg3"; - file "master.demo.zone"; + file "primary.demo.zone"; check-names fail; allow-update { none; }; allow-update-forwarding { 10.0.0.5; !any; }; @@ -227,11 +227,11 @@ zone "master.demo.zone" { forwarders { 10.0.0.3; 1:2:3:4:5:6:7:8; }; }; -zone "slave.demo.zone" { - type slave; // what used to be called "secondary" - file "slave.demo.zone"; - ixfr-base "slave.demo.zone.ixfr"; // File name for IXFR transaction log file - masters { +zone "secondary.demo.zone" { + type secondary; // what used to be called "secondary" + file "secondary.demo.zone"; + ixfr-base "secondary.demo.zone.ixfr"; // File name for IXFR transaction log file + primaries { 1.2.3.4 port 10 key "foo"; // where to zone transfer from 5.6.7.8; 6.7.8.9 key "zippo"; @@ -263,8 +263,8 @@ view "test-view" in { max-cache-size 100000; allow-query { 10.0.0.30;}; match-clients { 10.0.0.1 ; }; - check-names master warn; - check-names slave ignore; + check-names primary warn; + check-names secondary ignore; check-names response fail; auth-nxdomain false; recursion true; @@ -290,9 +290,9 @@ view "test-view" in { min-refresh-time 111; zone "view-zone.com" { - type master; + type primary; allow-update-forwarding { 10.0.0.34;}; - file "view-zone-master"; + file "view-zone-primary"; }; server 5.6.7.8 { @@ -307,12 +307,12 @@ view "test-view" in { zone "stub.demo.zone" { - type stub; // stub zones are like slave zones, + type stub; // stub zones are like secondary zones, // except that only the NS records // are transferred. dialup yes; file "stub.demo.zone"; - masters { + primaries { 1.2.3.4 ; // where to zone transfer from 5.6.7.8 port 999; }; @@ -348,7 +348,7 @@ acl can_axfr { 1.2.3.4; can_query; }; // host 1.2.3.4 and any host allowed // by can_query are OK zone "disabled-zone.com" { - type master; + type primary; file "bar"; max-retry-time 100; @@ -358,7 +358,7 @@ zone "disabled-zone.com" { }; zone "non-default-acl.demo.zone" { - type master; + type primary; file "foo"; allow-query { can_query; }; allow-transfer { can_axfr; }; diff --git a/bin/tests/startperf/setup.sh b/bin/tests/startperf/setup.sh index ff93d7942d..95fd0fa64f 100644 --- a/bin/tests/startperf/setup.sh +++ b/bin/tests/startperf/setup.sh @@ -71,10 +71,10 @@ EOF $PERL makenames.pl $nzones | while read zonename; do if [ $single_file ]; then - echo "zone $zonename { type master; file \"smallzone.db\"; };" + echo "zone $zonename { type primary; file \"smallzone.db\"; };" else [ -d zones ] || mkdir zones $PERL mkzonefile.pl $zonename $nrecords > zones/$zonename.db - echo "zone $zonename { type master; file \"zones/$zonename.db\"; };" + echo "zone $zonename { type primary; file \"zones/$zonename.db\"; };" fi done diff --git a/bin/tests/system/README b/bin/tests/system/README index f24bd0365e..2353438e96 100644 --- a/bin/tests/system/README +++ b/bin/tests/system/README @@ -187,7 +187,7 @@ structure: e.g. - I:catz:checking that dom1.example is not served by master (1) + I:catz:checking that dom1.example is not served by primary (1) The meanings of the fields are as follows: diff --git a/bin/tests/system/addzone/tests_rndc_deadlock.py b/bin/tests/system/addzone/tests_rndc_deadlock.py index 43318d38bb..ae9fb1cace 100755 --- a/bin/tests/system/addzone/tests_rndc_deadlock.py +++ b/bin/tests/system/addzone/tests_rndc_deadlock.py @@ -35,9 +35,9 @@ def rndc_loop(test_state, domain): ''' rndc_commands = [ ['addzone', domain, - '{ type master; file "example.db"; };'], + '{ type primary; file "example.db"; };'], ['modzone', domain, - '{ type master; file "example.db"; allow-transfer { any; }; };'], + '{ type primary; file "example.db"; allow-transfer { any; }; };'], ['delzone', domain], ] diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh index d3f6fd9f36..ffb1abd153 100644 --- a/bin/tests/system/catz/tests.sh +++ b/bin/tests/system/catz/tests.sh @@ -351,14 +351,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi status=$((status+ret)) ########################################################################## -echo_i "Testing masters suboption and random labels" +echo_i "Testing primaries suboption and random labels" n=$((n+1)) -echo_i "adding dom5.example. with a valid masters suboption (IP without TSIG) and a random label ($n)" +echo_i "adding dom5.example. with a valid primaries suboption (IP without TSIG) and a random label ($n)" ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} update add somerandomlabel.zones.catalog1.example. 3600 IN PTR dom5.example. - update add masters.somerandomlabel.zones.catalog1.example. 3600 IN A 10.53.0.3 + update add primaries.somerandomlabel.zones.catalog1.example. 3600 IN A 10.53.0.3 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi @@ -385,7 +385,7 @@ ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} update delete somerandomlabel.zones.catalog1.example. 3600 IN PTR dom5.example. - update delete masters.somerandomlabel.zones.catalog1.example. 3600 IN A 10.53.0.3 + update delete primaries.somerandomlabel.zones.catalog1.example. 3600 IN A 10.53.0.3 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi @@ -407,14 +407,14 @@ status=$((status+ret)) ########################################################################## -echo_i "Testing masters global option" +echo_i "Testing primaries global option" n=$((n+1)) -echo_i "adding dom6.example. and a valid global masters option (IP without TSIG) ($n)" +echo_i "adding dom6.example. and a valid global primaries option (IP without TSIG) ($n)" ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} - update add masters.catalog1.example. 3600 IN A 10.53.0.3 - update add masters.catalog1.example. 3600 IN AAAA fd92:7065:b8e:ffff::3 + update add primaries.catalog1.example. 3600 IN A 10.53.0.3 + update add primaries.catalog1.example. 3600 IN AAAA fd92:7065:b8e:ffff::3 update add 4346f565b4d63ddb99e5d2497ff22d04e878e8f8.zones.catalog1.example. 3600 IN PTR dom6.example. send END @@ -441,8 +441,8 @@ echo_i "removing dom6.example. ($n)" ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} - update delete masters.catalog1.example. 3600 IN A 10.53.0.3 - update delete masters.catalog1.example. 3600 IN AAAA fd92:7065:b8e:ffff::3 + update delete primaries.catalog1.example. 3600 IN A 10.53.0.3 + update delete primaries.catalog1.example. 3600 IN AAAA fd92:7065:b8e:ffff::3 update delete 4346f565b4d63ddb99e5d2497ff22d04e878e8f8.zones.catalog1.example. 3600 IN PTR dom6.example. send END @@ -466,7 +466,7 @@ status=$((status+ret)) nextpart ns2/named.run >/dev/null n=$((n+1)) -echo_i "adding dom6.example. and an invalid global masters option (TSIG without IP) ($n)" +echo_i "adding dom6.example. and an invalid global primaries option (TSIG without IP) ($n)" ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} @@ -679,7 +679,7 @@ status=$((status+ret)) ########################################################################## -echo_i "Testing TSIG keys for masters set per-domain" +echo_i "Testing TSIG keys for primaries set per-domain" n=$((n+1)) echo_i "adding a domain dom9.example. to primary via RNDC, with transfers allowed only with TSIG key ($n)" ret=0 @@ -699,7 +699,7 @@ status=$((status+ret)) nextpart ns2/named.run >/dev/null n=$((n+1)) -echo_i "adding domain dom9.example. to catalog1 zone with a valid masters suboption (IP with TSIG) ($n)" +echo_i "adding domain dom9.example. to catalog1 zone with a valid primaries suboption (IP with TSIG) ($n)" ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} @@ -756,7 +756,7 @@ status=$((status+ret)) nextpart ns2/named.run >/dev/null n=$((n+1)) -echo_i "adding domain dom9.example. to catalog1 zone with an invalid masters suboption (TSIG without IP) ($n)" +echo_i "adding domain dom9.example. to catalog1 zone with an invalid primaries suboption (TSIG without IP) ($n)" ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} @@ -1243,7 +1243,7 @@ ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} update add 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN PTR dom13.example. - update add masters.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN A 10.53.0.1 + update add primaries.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN A 10.53.0.1 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi @@ -1273,7 +1273,7 @@ ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.3 ${PORT} update add 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN PTR dom13.example. - update add masters.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN A 10.53.0.3 + update add primaries.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN A 10.53.0.3 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi @@ -1302,7 +1302,7 @@ ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.3 ${PORT} update delete 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN PTR dom13.example. - update delete masters.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN A 10.53.0.3 + update delete primaries.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN A 10.53.0.3 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi @@ -1329,7 +1329,7 @@ ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.1 ${PORT} update delete 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN PTR dom13.example. - update delete masters.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN A 10.53.0.2 + update delete primaries.8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN A 10.53.0.2 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi @@ -1424,7 +1424,7 @@ ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.3 ${PORT} update add 45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN PTR dom14.example. - update add masters.45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN A 10.53.0.3 + update add primaries.45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN A 10.53.0.3 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi @@ -1453,7 +1453,7 @@ ret=0 $NSUPDATE -d <> nsupdate.out.test$n 2>&1 || ret=1 server 10.53.0.3 ${PORT} update delete 45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN PTR dom14.example. - update delete masters.45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN A 10.53.0.3 + update delete primaries.45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN A 10.53.0.3 send END if [ $ret -ne 0 ]; then echo_i "failed"; fi diff --git a/bin/tests/system/checkconf/altdb.conf b/bin/tests/system/checkconf/altdb.conf index 0ee9680dcb..e99607676a 100644 --- a/bin/tests/system/checkconf/altdb.conf +++ b/bin/tests/system/checkconf/altdb.conf @@ -11,7 +11,7 @@ view override_bind chaos { zone "version.bind" chaos { - type master; + type primary; database "_builtin version"; }; }; diff --git a/bin/tests/system/checkconf/altdlz.conf b/bin/tests/system/checkconf/altdlz.conf index 8633197166..bdd3faee9d 100644 --- a/bin/tests/system/checkconf/altdlz.conf +++ b/bin/tests/system/checkconf/altdlz.conf @@ -15,7 +15,7 @@ dlz external { }; zone "example.com" { - type master; + type primary; dlz external; }; diff --git a/bin/tests/system/checkconf/bad-also-notify.conf b/bin/tests/system/checkconf/bad-also-notify.conf index bf27dab0a6..030030f1da 100644 --- a/bin/tests/system/checkconf/bad-also-notify.conf +++ b/bin/tests/system/checkconf/bad-also-notify.conf @@ -10,11 +10,11 @@ */ /* - * Missing master in also-notify clause. + * Missing primary in also-notify clause. */ zone dummy { - type master; + type primary; file "xxxx"; also-notify { xxxx; }; }; diff --git a/bin/tests/system/checkconf/bad-dnssec.conf b/bin/tests/system/checkconf/bad-dnssec.conf index 9db164ed28..852adec2cc 100644 --- a/bin/tests/system/checkconf/bad-dnssec.conf +++ b/bin/tests/system/checkconf/bad-dnssec.conf @@ -10,8 +10,8 @@ */ zone not-inline { - type slave; - masters { 127.0.0.1; }; + type secondary; + primaries { 127.0.0.1; }; inline-signing no; dnssec-dnskey-kskonly yes; update-check-ksk yes; @@ -20,8 +20,8 @@ zone not-inline { }; zone inline { - type slave; - masters { 127.0.0.1; }; + type secondary; + primaries { 127.0.0.1; }; inline-signing yes; dnssec-dnskey-kskonly yes; update-check-ksk yes; diff --git a/bin/tests/system/checkconf/bad-in-view-dup.conf b/bin/tests/system/checkconf/bad-in-view-dup.conf index dfde12401c..3e308f2f28 100644 --- a/bin/tests/system/checkconf/bad-in-view-dup.conf +++ b/bin/tests/system/checkconf/bad-in-view-dup.conf @@ -10,10 +10,10 @@ */ view a { - zone x { type master; file "x"; }; + zone x { type primary; file "x"; }; }; view b { - zone x { type master; file "x"; }; + zone x { type primary; file "x"; }; zone x { in-view a; }; }; diff --git a/bin/tests/system/checkconf/bad-inline-slave.conf b/bin/tests/system/checkconf/bad-inline-secondary.conf similarity index 77% rename from bin/tests/system/checkconf/bad-inline-slave.conf rename to bin/tests/system/checkconf/bad-inline-secondary.conf index ff283b62cd..880d103d21 100644 --- a/bin/tests/system/checkconf/bad-inline-slave.conf +++ b/bin/tests/system/checkconf/bad-inline-secondary.conf @@ -10,11 +10,11 @@ */ /* - * An inline-signing slave should be forced to have a file option + * An inline-signing secondary should be forced to have a file option */ zone "." { - type slave; + type secondary; inline-signing yes; - masters { 10.53.0.1; }; - }; \ No newline at end of file + primaries { 10.53.0.1; }; + }; diff --git a/bin/tests/system/checkconf/bad-kasp-define-default.conf b/bin/tests/system/checkconf/bad-kasp-define-default.conf index 65095c4f8e..f36d99776f 100644 --- a/bin/tests/system/checkconf/bad-kasp-define-default.conf +++ b/bin/tests/system/checkconf/bad-kasp-define-default.conf @@ -15,7 +15,7 @@ dnssec-policy "default" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; diff --git a/bin/tests/system/checkconf/bad-kasp-define-insecure.conf b/bin/tests/system/checkconf/bad-kasp-define-insecure.conf index 19ae2d56dd..57be164af1 100644 --- a/bin/tests/system/checkconf/bad-kasp-define-insecure.conf +++ b/bin/tests/system/checkconf/bad-kasp-define-insecure.conf @@ -15,7 +15,7 @@ dnssec-policy "insecure" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "insecure"; }; diff --git a/bin/tests/system/checkconf/bad-kasp-define-none.conf b/bin/tests/system/checkconf/bad-kasp-define-none.conf index 4fc3781699..31e7941591 100644 --- a/bin/tests/system/checkconf/bad-kasp-define-none.conf +++ b/bin/tests/system/checkconf/bad-kasp-define-none.conf @@ -15,7 +15,7 @@ dnssec-policy "none" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "none"; }; diff --git a/bin/tests/system/checkconf/bad-kasp-key1.conf b/bin/tests/system/checkconf/bad-kasp-key1.conf index 628788c349..43571d01c4 100644 --- a/bin/tests/system/checkconf/bad-kasp-key1.conf +++ b/bin/tests/system/checkconf/bad-kasp-key1.conf @@ -16,7 +16,7 @@ dnssec-policy "badalg" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "badalg"; }; diff --git a/bin/tests/system/checkconf/bad-kasp-key2.conf b/bin/tests/system/checkconf/bad-kasp-key2.conf index b6f513f18d..597b4b0918 100644 --- a/bin/tests/system/checkconf/bad-kasp-key2.conf +++ b/bin/tests/system/checkconf/bad-kasp-key2.conf @@ -16,7 +16,7 @@ dnssec-policy "badalg" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "badalg"; }; diff --git a/bin/tests/system/checkconf/bad-kasp-key3.conf b/bin/tests/system/checkconf/bad-kasp-key3.conf index 5a93301e45..a5f5245984 100644 --- a/bin/tests/system/checkconf/bad-kasp-key3.conf +++ b/bin/tests/system/checkconf/bad-kasp-key3.conf @@ -16,7 +16,7 @@ dnssec-policy "badalg" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "badalg"; }; diff --git a/bin/tests/system/checkconf/bad-kasp-key4.conf b/bin/tests/system/checkconf/bad-kasp-key4.conf index 785b3ca831..4a72d35626 100644 --- a/bin/tests/system/checkconf/bad-kasp-key4.conf +++ b/bin/tests/system/checkconf/bad-kasp-key4.conf @@ -16,7 +16,7 @@ dnssec-policy "badalg" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "badalg"; }; diff --git a/bin/tests/system/checkconf/bad-kasp10.conf b/bin/tests/system/checkconf/bad-kasp10.conf index 026fb52aaa..6205075b89 100644 --- a/bin/tests/system/checkconf/bad-kasp10.conf +++ b/bin/tests/system/checkconf/bad-kasp10.conf @@ -13,13 +13,13 @@ // both using the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "none"; }; zone "example2.net" { - type master; + type primary; file "example.db"; dnssec-policy "insecure"; }; diff --git a/bin/tests/system/checkconf/bad-kasp11.conf b/bin/tests/system/checkconf/bad-kasp11.conf index 6d5f51813e..a5ec158211 100644 --- a/bin/tests/system/checkconf/bad-kasp11.conf +++ b/bin/tests/system/checkconf/bad-kasp11.conf @@ -13,13 +13,13 @@ // with the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; zone "example2.net" { - type master; + type primary; file "example.db"; allow-update { any; }; }; diff --git a/bin/tests/system/checkconf/bad-kasp12.conf b/bin/tests/system/checkconf/bad-kasp12.conf index 3251f61874..3b899a5364 100644 --- a/bin/tests/system/checkconf/bad-kasp12.conf +++ b/bin/tests/system/checkconf/bad-kasp12.conf @@ -13,13 +13,13 @@ // with the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; zone "example2.net" { - type master; + type primary; file "example.db"; update-policy { grant * self * TXT; diff --git a/bin/tests/system/checkconf/bad-kasp13.conf b/bin/tests/system/checkconf/bad-kasp13.conf index 503859ba44..0ac16727c9 100644 --- a/bin/tests/system/checkconf/bad-kasp13.conf +++ b/bin/tests/system/checkconf/bad-kasp13.conf @@ -13,13 +13,13 @@ // with the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "insecure"; }; zone "example2.net" { - type master; + type primary; file "example.db"; allow-update { any; }; }; diff --git a/bin/tests/system/checkconf/bad-kasp2.conf b/bin/tests/system/checkconf/bad-kasp2.conf index a7b44ab6d0..7bfda9e2a3 100644 --- a/bin/tests/system/checkconf/bad-kasp2.conf +++ b/bin/tests/system/checkconf/bad-kasp2.conf @@ -14,7 +14,7 @@ include "good-kasp.conf"; // Bad zone configuration because this has dnssec-policy and other DNSSEC sign // configuration options (auto-dnssec). zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "test"; auto-dnssec maintain; diff --git a/bin/tests/system/checkconf/bad-kasp3.conf b/bin/tests/system/checkconf/bad-kasp3.conf index 104100dc59..b28c5a6499 100644 --- a/bin/tests/system/checkconf/bad-kasp3.conf +++ b/bin/tests/system/checkconf/bad-kasp3.conf @@ -15,7 +15,7 @@ include "good-kasp.conf"; // dnssec-policy configuration (good-kasp.conf has "test", zone refers to // "nosuchpolicy". zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "nosuchpolicy"; }; diff --git a/bin/tests/system/checkconf/bad-kasp4.conf b/bin/tests/system/checkconf/bad-kasp4.conf index efb2cbefa8..fc6ea10f96 100644 --- a/bin/tests/system/checkconf/bad-kasp4.conf +++ b/bin/tests/system/checkconf/bad-kasp4.conf @@ -16,7 +16,7 @@ dnssec-policy "badduration" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "badduration"; }; diff --git a/bin/tests/system/checkconf/bad-kasp6.conf b/bin/tests/system/checkconf/bad-kasp6.conf index 672f4df868..2dd6a8e508 100644 --- a/bin/tests/system/checkconf/bad-kasp6.conf +++ b/bin/tests/system/checkconf/bad-kasp6.conf @@ -12,13 +12,13 @@ // Two zones with dnssec-policy with the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; zone "example2.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; diff --git a/bin/tests/system/checkconf/bad-kasp7.conf b/bin/tests/system/checkconf/bad-kasp7.conf index b7ba4a9b2e..9370bf646e 100644 --- a/bin/tests/system/checkconf/bad-kasp7.conf +++ b/bin/tests/system/checkconf/bad-kasp7.conf @@ -13,13 +13,13 @@ // with the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "insecure"; }; zone "example2.net" { - type master; + type primary; file "example.db"; dnssec-policy "insecure"; }; diff --git a/bin/tests/system/checkconf/bad-kasp8.conf b/bin/tests/system/checkconf/bad-kasp8.conf index af4f1a3d5a..8c199bfe16 100644 --- a/bin/tests/system/checkconf/bad-kasp8.conf +++ b/bin/tests/system/checkconf/bad-kasp8.conf @@ -13,13 +13,13 @@ // both with the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; zone "example2.net" { - type master; + type primary; file "example.db"; dnssec-policy "none"; }; diff --git a/bin/tests/system/checkconf/bad-kasp9.conf b/bin/tests/system/checkconf/bad-kasp9.conf index 7fc5370afc..a557127007 100644 --- a/bin/tests/system/checkconf/bad-kasp9.conf +++ b/bin/tests/system/checkconf/bad-kasp9.conf @@ -13,13 +13,13 @@ // (transitioning to inseure), both with the same zone file. zone "example1.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; zone "example2.net" { - type master; + type primary; file "example.db"; dnssec-policy "insecure"; }; diff --git a/bin/tests/system/checkconf/bad-master-request-ixfr.conf b/bin/tests/system/checkconf/bad-master-request-ixfr.conf index 2d3913f71c..4d28d033eb 100644 --- a/bin/tests/system/checkconf/bad-master-request-ixfr.conf +++ b/bin/tests/system/checkconf/bad-master-request-ixfr.conf @@ -10,11 +10,11 @@ */ /* - * request-ixfr clause is not allowed in zone of type master. + * request-ixfr clause is not allowed in zone of type primary. */ zone dummy { - type master; + type primary; request-ixfr no; file "xxxx"; }; diff --git a/bin/tests/system/checkconf/bad-maxratio1.conf b/bin/tests/system/checkconf/bad-maxratio1.conf index 1f612e3edf..4bf5612600 100644 --- a/bin/tests/system/checkconf/bad-maxratio1.conf +++ b/bin/tests/system/checkconf/bad-maxratio1.conf @@ -10,7 +10,7 @@ */ zone example { - type master; + type primary; masterfile-format raw; file "example.db"; max-ixfr-ratio 0.9; diff --git a/bin/tests/system/checkconf/bad-maxratio2.conf b/bin/tests/system/checkconf/bad-maxratio2.conf index 2fab381c04..9090fa9e00 100644 --- a/bin/tests/system/checkconf/bad-maxratio2.conf +++ b/bin/tests/system/checkconf/bad-maxratio2.conf @@ -10,7 +10,7 @@ */ zone example { - type master; + type primary; masterfile-format raw; file "example.db"; max-ixfr-ratio 0%; diff --git a/bin/tests/system/checkconf/bad-mirror-allow-recursion-none.conf b/bin/tests/system/checkconf/bad-mirror-allow-recursion-none.conf index 9dabf8897e..e872d02c7c 100644 --- a/bin/tests/system/checkconf/bad-mirror-allow-recursion-none.conf +++ b/bin/tests/system/checkconf/bad-mirror-allow-recursion-none.conf @@ -16,5 +16,5 @@ options { zone "." { type mirror; - masters { 127.0.0.1; }; + primaries { 127.0.0.1; }; }; diff --git a/bin/tests/system/checkconf/bad-noddns.conf b/bin/tests/system/checkconf/bad-noddns.conf index d4e93dcbf6..729558966d 100644 --- a/bin/tests/system/checkconf/bad-noddns.conf +++ b/bin/tests/system/checkconf/bad-noddns.conf @@ -10,7 +10,7 @@ */ zone example { - type master; + type primary; file "example.db"; auto-dnssec maintain; allow-update { none; }; diff --git a/bin/tests/system/checkconf/bad-options-also-notify.conf b/bin/tests/system/checkconf/bad-options-also-notify.conf index d5a28c0e3a..028b0ef63d 100644 --- a/bin/tests/system/checkconf/bad-options-also-notify.conf +++ b/bin/tests/system/checkconf/bad-options-also-notify.conf @@ -14,6 +14,6 @@ options { }; zone "example.net" { - type slave; - masters { 192.168.1.1; }; + type secondary; + primaries { 192.168.1.1; }; }; diff --git a/bin/tests/system/checkconf/bad-masters-dup.conf b/bin/tests/system/checkconf/bad-primaries-dup.conf similarity index 100% rename from bin/tests/system/checkconf/bad-masters-dup.conf rename to bin/tests/system/checkconf/bad-primaries-dup.conf diff --git a/bin/tests/system/checkconf/bad-rpz-too-many-zones.conf b/bin/tests/system/checkconf/bad-rpz-too-many-zones.conf index 92a13bed39..959a25967c 100644 --- a/bin/tests/system/checkconf/bad-rpz-too-many-zones.conf +++ b/bin/tests/system/checkconf/bad-rpz-too-many-zones.conf @@ -79,68 +79,68 @@ options { }; }; -zone "max1" { type master; file "rpz.db"; }; -zone "max2" { type master; file "rpz.db"; }; -zone "max3" { type master; file "rpz.db"; }; -zone "max4" { type master; file "rpz.db"; }; -zone "max5" { type master; file "rpz.db"; }; -zone "max6" { type master; file "rpz.db"; }; -zone "max7" { type master; file "rpz.db"; }; -zone "max8" { type master; file "rpz.db"; }; -zone "max9" { type master; file "rpz.db"; }; -zone "max10" { type master; file "rpz.db"; }; -zone "max11" { type master; file "rpz.db"; }; -zone "max12" { type master; file "rpz.db"; }; -zone "max13" { type master; file "rpz.db"; }; -zone "max14" { type master; file "rpz.db"; }; -zone "max15" { type master; file "rpz.db"; }; -zone "max16" { type master; file "rpz.db"; }; -zone "max17" { type master; file "rpz.db"; }; -zone "max18" { type master; file "rpz.db"; }; -zone "max19" { type master; file "rpz.db"; }; -zone "max20" { type master; file "rpz.db"; }; -zone "max21" { type master; file "rpz.db"; }; -zone "max22" { type master; file "rpz.db"; }; -zone "max23" { type master; file "rpz.db"; }; -zone "max24" { type master; file "rpz.db"; }; -zone "max25" { type master; file "rpz.db"; }; -zone "max26" { type master; file "rpz.db"; }; -zone "max27" { type master; file "rpz.db"; }; -zone "max28" { type master; file "rpz.db"; }; -zone "max29" { type master; file "rpz.db"; }; -zone "max30" { type master; file "rpz.db"; }; -zone "max31" { type master; file "rpz.db"; }; -zone "max32" { type master; file "rpz.db"; }; -zone "max33" { type master; file "rpz.db"; }; -zone "max34" { type master; file "rpz.db"; }; -zone "max35" { type master; file "rpz.db"; }; -zone "max36" { type master; file "rpz.db"; }; -zone "max37" { type master; file "rpz.db"; }; -zone "max38" { type master; file "rpz.db"; }; -zone "max39" { type master; file "rpz.db"; }; -zone "max40" { type master; file "rpz.db"; }; -zone "max41" { type master; file "rpz.db"; }; -zone "max42" { type master; file "rpz.db"; }; -zone "max43" { type master; file "rpz.db"; }; -zone "max44" { type master; file "rpz.db"; }; -zone "max45" { type master; file "rpz.db"; }; -zone "max46" { type master; file "rpz.db"; }; -zone "max47" { type master; file "rpz.db"; }; -zone "max48" { type master; file "rpz.db"; }; -zone "max49" { type master; file "rpz.db"; }; -zone "max50" { type master; file "rpz.db"; }; -zone "max51" { type master; file "rpz.db"; }; -zone "max52" { type master; file "rpz.db"; }; -zone "max53" { type master; file "rpz.db"; }; -zone "max54" { type master; file "rpz.db"; }; -zone "max55" { type master; file "rpz.db"; }; -zone "max56" { type master; file "rpz.db"; }; -zone "max57" { type master; file "rpz.db"; }; -zone "max58" { type master; file "rpz.db"; }; -zone "max59" { type master; file "rpz.db"; }; -zone "max60" { type master; file "rpz.db"; }; -zone "max61" { type master; file "rpz.db"; }; -zone "max62" { type master; file "rpz.db"; }; -zone "max63" { type master; file "rpz.db"; }; -zone "max64" { type master; file "rpz.db"; }; -zone "max65" { type master; file "rpz.db"; }; +zone "max1" { type primary; file "rpz.db"; }; +zone "max2" { type primary; file "rpz.db"; }; +zone "max3" { type primary; file "rpz.db"; }; +zone "max4" { type primary; file "rpz.db"; }; +zone "max5" { type primary; file "rpz.db"; }; +zone "max6" { type primary; file "rpz.db"; }; +zone "max7" { type primary; file "rpz.db"; }; +zone "max8" { type primary; file "rpz.db"; }; +zone "max9" { type primary; file "rpz.db"; }; +zone "max10" { type primary; file "rpz.db"; }; +zone "max11" { type primary; file "rpz.db"; }; +zone "max12" { type primary; file "rpz.db"; }; +zone "max13" { type primary; file "rpz.db"; }; +zone "max14" { type primary; file "rpz.db"; }; +zone "max15" { type primary; file "rpz.db"; }; +zone "max16" { type primary; file "rpz.db"; }; +zone "max17" { type primary; file "rpz.db"; }; +zone "max18" { type primary; file "rpz.db"; }; +zone "max19" { type primary; file "rpz.db"; }; +zone "max20" { type primary; file "rpz.db"; }; +zone "max21" { type primary; file "rpz.db"; }; +zone "max22" { type primary; file "rpz.db"; }; +zone "max23" { type primary; file "rpz.db"; }; +zone "max24" { type primary; file "rpz.db"; }; +zone "max25" { type primary; file "rpz.db"; }; +zone "max26" { type primary; file "rpz.db"; }; +zone "max27" { type primary; file "rpz.db"; }; +zone "max28" { type primary; file "rpz.db"; }; +zone "max29" { type primary; file "rpz.db"; }; +zone "max30" { type primary; file "rpz.db"; }; +zone "max31" { type primary; file "rpz.db"; }; +zone "max32" { type primary; file "rpz.db"; }; +zone "max33" { type primary; file "rpz.db"; }; +zone "max34" { type primary; file "rpz.db"; }; +zone "max35" { type primary; file "rpz.db"; }; +zone "max36" { type primary; file "rpz.db"; }; +zone "max37" { type primary; file "rpz.db"; }; +zone "max38" { type primary; file "rpz.db"; }; +zone "max39" { type primary; file "rpz.db"; }; +zone "max40" { type primary; file "rpz.db"; }; +zone "max41" { type primary; file "rpz.db"; }; +zone "max42" { type primary; file "rpz.db"; }; +zone "max43" { type primary; file "rpz.db"; }; +zone "max44" { type primary; file "rpz.db"; }; +zone "max45" { type primary; file "rpz.db"; }; +zone "max46" { type primary; file "rpz.db"; }; +zone "max47" { type primary; file "rpz.db"; }; +zone "max48" { type primary; file "rpz.db"; }; +zone "max49" { type primary; file "rpz.db"; }; +zone "max50" { type primary; file "rpz.db"; }; +zone "max51" { type primary; file "rpz.db"; }; +zone "max52" { type primary; file "rpz.db"; }; +zone "max53" { type primary; file "rpz.db"; }; +zone "max54" { type primary; file "rpz.db"; }; +zone "max55" { type primary; file "rpz.db"; }; +zone "max56" { type primary; file "rpz.db"; }; +zone "max57" { type primary; file "rpz.db"; }; +zone "max58" { type primary; file "rpz.db"; }; +zone "max59" { type primary; file "rpz.db"; }; +zone "max60" { type primary; file "rpz.db"; }; +zone "max61" { type primary; file "rpz.db"; }; +zone "max62" { type primary; file "rpz.db"; }; +zone "max63" { type primary; file "rpz.db"; }; +zone "max64" { type primary; file "rpz.db"; }; +zone "max65" { type primary; file "rpz.db"; }; diff --git a/bin/tests/system/checkconf/bad-rpz-ttl.conf b/bin/tests/system/checkconf/bad-rpz-ttl.conf index af35952982..9539938eb7 100644 --- a/bin/tests/system/checkconf/bad-rpz-ttl.conf +++ b/bin/tests/system/checkconf/bad-rpz-ttl.conf @@ -10,7 +10,7 @@ */ zone "example.com." { - type master; + type primary; file "example.com.zone"; }; diff --git a/bin/tests/system/checkconf/bad-rpz-update.conf b/bin/tests/system/checkconf/bad-rpz-update.conf index 1c06bfd508..8805b7c5a6 100644 --- a/bin/tests/system/checkconf/bad-rpz-update.conf +++ b/bin/tests/system/checkconf/bad-rpz-update.conf @@ -10,7 +10,7 @@ */ zone "example.com." { - type master; + type primary; file "example.com.zone"; }; diff --git a/bin/tests/system/checkconf/bad-sharedwritable1.conf b/bin/tests/system/checkconf/bad-sharedwritable1.conf index 38d244a696..b10fb520e5 100644 --- a/bin/tests/system/checkconf/bad-sharedwritable1.conf +++ b/bin/tests/system/checkconf/bad-sharedwritable1.conf @@ -10,11 +10,11 @@ */ zone a { - type master; + type primary; file "shared.db"; }; zone b { - type slave; + type secondary; file "shared.db"; - masters { 1.2.3.4; }; + primaries { 1.2.3.4; }; }; diff --git a/bin/tests/system/checkconf/bad-sharedwritable2.conf b/bin/tests/system/checkconf/bad-sharedwritable2.conf index 31c77c417c..7f68e9c4da 100644 --- a/bin/tests/system/checkconf/bad-sharedwritable2.conf +++ b/bin/tests/system/checkconf/bad-sharedwritable2.conf @@ -10,12 +10,12 @@ */ zone a { - type slave; + type secondary; file "shared.db"; - masters { 1.2.3.4; }; + primaries { 1.2.3.4; }; }; zone b { - type slave; + type secondary; file "shared.db"; - masters { 1.2.3.4; }; + primaries { 1.2.3.4; }; }; diff --git a/bin/tests/system/checkconf/bad-sharedzone1.conf b/bin/tests/system/checkconf/bad-sharedzone1.conf index 3782991fa5..12c4f6a4f6 100644 --- a/bin/tests/system/checkconf/bad-sharedzone1.conf +++ b/bin/tests/system/checkconf/bad-sharedzone1.conf @@ -14,7 +14,7 @@ view "first" { "none"; }; zone "clone" { - type master; + type primary; file "xxx"; }; }; @@ -24,6 +24,6 @@ view "second" { }; zone "clone" { in-view "first"; - type slave; + type secondary; }; }; diff --git a/bin/tests/system/checkconf/bad-sharedzone2.conf b/bin/tests/system/checkconf/bad-sharedzone2.conf index 91b0472d9a..50159584a8 100644 --- a/bin/tests/system/checkconf/bad-sharedzone2.conf +++ b/bin/tests/system/checkconf/bad-sharedzone2.conf @@ -14,7 +14,7 @@ view "first" { "none"; }; zone "clone" { - type master; + type primary; file "xxx"; }; }; @@ -26,6 +26,6 @@ view "second" { in-view "first"; forward only; forwarders { 10.0.0.100; }; - type slave; + type secondary; }; }; diff --git a/bin/tests/system/checkconf/bad-sharedzone3.conf b/bin/tests/system/checkconf/bad-sharedzone3.conf index e174ab1165..d4b12d66f2 100644 --- a/bin/tests/system/checkconf/bad-sharedzone3.conf +++ b/bin/tests/system/checkconf/bad-sharedzone3.conf @@ -17,7 +17,7 @@ view first { view second { zone shared.example { - type master; + type primary; file "shared.example.db"; }; }; diff --git a/bin/tests/system/checkconf/bad-stub-masters-dialup.conf b/bin/tests/system/checkconf/bad-stub-masters-dialup.conf index 750daf886f..868aab761f 100644 --- a/bin/tests/system/checkconf/bad-stub-masters-dialup.conf +++ b/bin/tests/system/checkconf/bad-stub-masters-dialup.conf @@ -19,5 +19,5 @@ zone "example." { dialup notify; notify no; file "example.bk"; - // masters { 10.53.0.1; }; + // primaries { 10.53.0.1; }; }; diff --git a/bin/tests/system/checkconf/bad-update-policy1.conf b/bin/tests/system/checkconf/bad-update-policy1.conf index 13e21db605..30289bcd53 100644 --- a/bin/tests/system/checkconf/bad-update-policy1.conf +++ b/bin/tests/system/checkconf/bad-update-policy1.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * self TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy10.conf b/bin/tests/system/checkconf/bad-update-policy10.conf index 8c9a4adebf..f3604078d3 100644 --- a/bin/tests/system/checkconf/bad-update-policy10.conf +++ b/bin/tests/system/checkconf/bad-update-policy10.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * krb5-selfsub TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy11.conf b/bin/tests/system/checkconf/bad-update-policy11.conf index 6f81c31017..5d958b683b 100644 --- a/bin/tests/system/checkconf/bad-update-policy11.conf +++ b/bin/tests/system/checkconf/bad-update-policy11.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * ms-selfsub TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy12.conf b/bin/tests/system/checkconf/bad-update-policy12.conf index c636f1bf65..899996c03f 100644 --- a/bin/tests/system/checkconf/bad-update-policy12.conf +++ b/bin/tests/system/checkconf/bad-update-policy12.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * external TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy13.conf b/bin/tests/system/checkconf/bad-update-policy13.conf index 4fb16f204a..6234e23fb7 100644 --- a/bin/tests/system/checkconf/bad-update-policy13.conf +++ b/bin/tests/system/checkconf/bad-update-policy13.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant a-key-name name TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy14.conf b/bin/tests/system/checkconf/bad-update-policy14.conf index 1498180d45..8615278ba8 100644 --- a/bin/tests/system/checkconf/bad-update-policy14.conf +++ b/bin/tests/system/checkconf/bad-update-policy14.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant a-key-name subdomain TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy15.conf b/bin/tests/system/checkconf/bad-update-policy15.conf index 7591b0b36c..bbc0430528 100644 --- a/bin/tests/system/checkconf/bad-update-policy15.conf +++ b/bin/tests/system/checkconf/bad-update-policy15.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant a-key-name wildcard TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy16.conf b/bin/tests/system/checkconf/bad-update-policy16.conf index 6870e65e62..51aba35a1d 100644 --- a/bin/tests/system/checkconf/bad-update-policy16.conf +++ b/bin/tests/system/checkconf/bad-update-policy16.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * tcp-self . "ptr(10 )"; diff --git a/bin/tests/system/checkconf/bad-update-policy2.conf b/bin/tests/system/checkconf/bad-update-policy2.conf index 987e0967c3..d94d498025 100644 --- a/bin/tests/system/checkconf/bad-update-policy2.conf +++ b/bin/tests/system/checkconf/bad-update-policy2.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * selfsub TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy3.conf b/bin/tests/system/checkconf/bad-update-policy3.conf index ff0811f947..c07c7ba4d7 100644 --- a/bin/tests/system/checkconf/bad-update-policy3.conf +++ b/bin/tests/system/checkconf/bad-update-policy3.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * selfwild TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy4.conf b/bin/tests/system/checkconf/bad-update-policy4.conf index 396f69b81e..b0abfc1cc6 100644 --- a/bin/tests/system/checkconf/bad-update-policy4.conf +++ b/bin/tests/system/checkconf/bad-update-policy4.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * ms-self TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy5.conf b/bin/tests/system/checkconf/bad-update-policy5.conf index 718dad5346..0e84043db3 100644 --- a/bin/tests/system/checkconf/bad-update-policy5.conf +++ b/bin/tests/system/checkconf/bad-update-policy5.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * krb5-self TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy6.conf b/bin/tests/system/checkconf/bad-update-policy6.conf index 992e384a50..16c7dd21f1 100644 --- a/bin/tests/system/checkconf/bad-update-policy6.conf +++ b/bin/tests/system/checkconf/bad-update-policy6.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * ms-subdomain TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy7.conf b/bin/tests/system/checkconf/bad-update-policy7.conf index 3bd2185aeb..cf2c4ee1ab 100644 --- a/bin/tests/system/checkconf/bad-update-policy7.conf +++ b/bin/tests/system/checkconf/bad-update-policy7.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * krb5-subdomain TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy8.conf b/bin/tests/system/checkconf/bad-update-policy8.conf index c88b0e2519..392b742e4e 100644 --- a/bin/tests/system/checkconf/bad-update-policy8.conf +++ b/bin/tests/system/checkconf/bad-update-policy8.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * tcp-self TXT; diff --git a/bin/tests/system/checkconf/bad-update-policy9.conf b/bin/tests/system/checkconf/bad-update-policy9.conf index 382f899fec..e167e9a5c9 100644 --- a/bin/tests/system/checkconf/bad-update-policy9.conf +++ b/bin/tests/system/checkconf/bad-update-policy9.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * 6to4-self TXT; diff --git a/bin/tests/system/checkconf/bad-view-also-notify.conf b/bin/tests/system/checkconf/bad-view-also-notify.conf index 418fa47a8f..25d6460a94 100644 --- a/bin/tests/system/checkconf/bad-view-also-notify.conf +++ b/bin/tests/system/checkconf/bad-view-also-notify.conf @@ -12,7 +12,7 @@ view example { also-notify { missing; }; zone "example.net" { - type slave; - masters { 192.168.1.1; }; + type secondary; + primaries { 192.168.1.1; }; }; }; diff --git a/bin/tests/system/checkconf/check-dup-records-fail.conf b/bin/tests/system/checkconf/check-dup-records-fail.conf index 684e8c6ee0..154bd29dfb 100644 --- a/bin/tests/system/checkconf/check-dup-records-fail.conf +++ b/bin/tests/system/checkconf/check-dup-records-fail.conf @@ -14,7 +14,7 @@ options { }; zone "check-dup-records" { - type master; + type primary; file "check-dup-records.db"; check-dup-records fail; }; diff --git a/bin/tests/system/checkconf/check-missing-zone.conf b/bin/tests/system/checkconf/check-missing-zone.conf index f43d3e2575..2d4aba39cb 100644 --- a/bin/tests/system/checkconf/check-missing-zone.conf +++ b/bin/tests/system/checkconf/check-missing-zone.conf @@ -11,14 +11,14 @@ view missing { zone missing.example { - type master; + type primary; file "missing.example.db"; }; }; view good { zone shared.example { - type master; + type primary; file "shared.example.db"; }; }; diff --git a/bin/tests/system/checkconf/check-mx-cname-fail.conf b/bin/tests/system/checkconf/check-mx-cname-fail.conf index 71292c8881..b0c20279c9 100644 --- a/bin/tests/system/checkconf/check-mx-cname-fail.conf +++ b/bin/tests/system/checkconf/check-mx-cname-fail.conf @@ -14,7 +14,7 @@ options { }; zone "check-mx-cname" { - type master; + type primary; file "check-mx-cname.db"; check-mx-cname fail; }; diff --git a/bin/tests/system/checkconf/check-mx-fail.conf b/bin/tests/system/checkconf/check-mx-fail.conf index 2eb8ad676b..17a4e96eca 100644 --- a/bin/tests/system/checkconf/check-mx-fail.conf +++ b/bin/tests/system/checkconf/check-mx-fail.conf @@ -14,7 +14,7 @@ options { }; zone "check-mx" { - type master; + type primary; file "check-mx.db"; check-mx fail; }; diff --git a/bin/tests/system/checkconf/check-names-fail.conf b/bin/tests/system/checkconf/check-names-fail.conf index 9c0ac26eae..27ade2dc13 100644 --- a/bin/tests/system/checkconf/check-names-fail.conf +++ b/bin/tests/system/checkconf/check-names-fail.conf @@ -14,7 +14,7 @@ options { }; zone "check-names" { - type master; + type primary; file "check-names.db"; check-names fail; }; diff --git a/bin/tests/system/checkconf/check-srv-cname-fail.conf b/bin/tests/system/checkconf/check-srv-cname-fail.conf index e84630729a..840b7096da 100644 --- a/bin/tests/system/checkconf/check-srv-cname-fail.conf +++ b/bin/tests/system/checkconf/check-srv-cname-fail.conf @@ -14,7 +14,7 @@ options { }; zone "check-srv-cname" { - type master; + type primary; file "check-srv-cname.db"; check-srv-cname fail; }; diff --git a/bin/tests/system/checkconf/dlz-bad.conf b/bin/tests/system/checkconf/dlz-bad.conf index 2ba89b19d3..3d703231cf 100644 --- a/bin/tests/system/checkconf/dlz-bad.conf +++ b/bin/tests/system/checkconf/dlz-bad.conf @@ -18,8 +18,8 @@ dlz two { search no; }; -zone master { - type master; +zone primary { + type primary; database "none"; dlz two; }; diff --git a/bin/tests/system/checkconf/good-kasp.conf b/bin/tests/system/checkconf/good-kasp.conf index 2aa3091a8a..d74b5d217e 100644 --- a/bin/tests/system/checkconf/good-kasp.conf +++ b/bin/tests/system/checkconf/good-kasp.conf @@ -36,26 +36,26 @@ options { dnssec-policy "default"; }; zone "example1" { - type master; + type primary; file "example1.db"; }; zone "example2" { - type master; + type primary; file "example2.db"; dnssec-policy "test"; }; zone "example3" { - type master; + type primary; file "example3.db"; dnssec-policy "default"; }; zone "dnssec-policy-none-shared-zonefile1" { - type master; + type primary; file "shared.db"; dnssec-policy "none"; }; zone "dnssec-policy-none-shared-zonefile2" { - type master; + type primary; file "shared.db"; dnssec-policy "none"; }; diff --git a/bin/tests/system/checkconf/good-maxratio1.conf b/bin/tests/system/checkconf/good-maxratio1.conf index d2225fefd6..b9d3a0fab6 100644 --- a/bin/tests/system/checkconf/good-maxratio1.conf +++ b/bin/tests/system/checkconf/good-maxratio1.conf @@ -10,7 +10,7 @@ */ zone example { - type master; + type primary; masterfile-format raw; file "example.db"; max-ixfr-ratio 50%; diff --git a/bin/tests/system/checkconf/good-maxratio2.conf b/bin/tests/system/checkconf/good-maxratio2.conf index ed55995eac..30f35666c2 100644 --- a/bin/tests/system/checkconf/good-maxratio2.conf +++ b/bin/tests/system/checkconf/good-maxratio2.conf @@ -10,7 +10,7 @@ */ zone example { - type master; + type primary; masterfile-format raw; file "example.db"; max-ixfr-ratio unlimited; diff --git a/bin/tests/system/checkconf/good-options-also-notify.conf b/bin/tests/system/checkconf/good-options-also-notify.conf index fcb01638d9..7f933fe42f 100644 --- a/bin/tests/system/checkconf/good-options-also-notify.conf +++ b/bin/tests/system/checkconf/good-options-also-notify.conf @@ -14,7 +14,7 @@ options { }; zone "example.net" { - type slave; + type secondary; notify no; - masters { 192.168.1.1; }; + primaries { 192.168.1.1; }; }; diff --git a/bin/tests/system/checkconf/good-response-dot.conf b/bin/tests/system/checkconf/good-response-dot.conf index 68e511f9be..23e6a43c7c 100644 --- a/bin/tests/system/checkconf/good-response-dot.conf +++ b/bin/tests/system/checkconf/good-response-dot.conf @@ -10,7 +10,7 @@ */ zone "example.com." { - type master; + type primary; file "example.com.zone"; }; diff --git a/bin/tests/system/checkconf/good-rpz-ttl.conf b/bin/tests/system/checkconf/good-rpz-ttl.conf index 96d09a9b85..15c826d79a 100644 --- a/bin/tests/system/checkconf/good-rpz-ttl.conf +++ b/bin/tests/system/checkconf/good-rpz-ttl.conf @@ -10,7 +10,7 @@ */ zone "example.com." { - type master; + type primary; file "example.com.zone"; }; diff --git a/bin/tests/system/checkconf/good-rpz-update.conf b/bin/tests/system/checkconf/good-rpz-update.conf index 188b559f48..23c6475ba3 100644 --- a/bin/tests/system/checkconf/good-rpz-update.conf +++ b/bin/tests/system/checkconf/good-rpz-update.conf @@ -10,7 +10,7 @@ */ zone "example.com." { - type master; + type primary; file "example.com.zone"; }; diff --git a/bin/tests/system/checkconf/good-sig-signing-type.conf b/bin/tests/system/checkconf/good-sig-signing-type.conf index 51ecc93bc7..0cee6a7f68 100644 --- a/bin/tests/system/checkconf/good-sig-signing-type.conf +++ b/bin/tests/system/checkconf/good-sig-signing-type.conf @@ -1,5 +1,5 @@ zone example { - type master; + type primary; file "example.db"; sig-signing-type 65280; }; diff --git a/bin/tests/system/checkconf/good-update-policy1.conf b/bin/tests/system/checkconf/good-update-policy1.conf index 8d345186bc..98990d5b3b 100644 --- a/bin/tests/system/checkconf/good-update-policy1.conf +++ b/bin/tests/system/checkconf/good-update-policy1.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * self * TXT; diff --git a/bin/tests/system/checkconf/good-update-policy10.conf b/bin/tests/system/checkconf/good-update-policy10.conf index 60bea6b56f..2ee3e5f206 100644 --- a/bin/tests/system/checkconf/good-update-policy10.conf +++ b/bin/tests/system/checkconf/good-update-policy10.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * krb5-subdomain . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy11.conf b/bin/tests/system/checkconf/good-update-policy11.conf index ba6f396f5b..72dd66824a 100644 --- a/bin/tests/system/checkconf/good-update-policy11.conf +++ b/bin/tests/system/checkconf/good-update-policy11.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * tcp-self . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy12.conf b/bin/tests/system/checkconf/good-update-policy12.conf index 09bd926a4c..b1ec61181f 100644 --- a/bin/tests/system/checkconf/good-update-policy12.conf +++ b/bin/tests/system/checkconf/good-update-policy12.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * 6to4-self . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy13.conf b/bin/tests/system/checkconf/good-update-policy13.conf index e67e01f319..5c0a8c9f76 100644 --- a/bin/tests/system/checkconf/good-update-policy13.conf +++ b/bin/tests/system/checkconf/good-update-policy13.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * tcp-self . ptr(1); diff --git a/bin/tests/system/checkconf/good-update-policy2.conf b/bin/tests/system/checkconf/good-update-policy2.conf index 5b453e7307..b0f8716d37 100644 --- a/bin/tests/system/checkconf/good-update-policy2.conf +++ b/bin/tests/system/checkconf/good-update-policy2.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * self . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy3.conf b/bin/tests/system/checkconf/good-update-policy3.conf index 3f4cef24ab..b5110cf423 100644 --- a/bin/tests/system/checkconf/good-update-policy3.conf +++ b/bin/tests/system/checkconf/good-update-policy3.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * selfsub . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy4.conf b/bin/tests/system/checkconf/good-update-policy4.conf index a3ef5343a3..204f9a4d18 100644 --- a/bin/tests/system/checkconf/good-update-policy4.conf +++ b/bin/tests/system/checkconf/good-update-policy4.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * selfsub * TXT; diff --git a/bin/tests/system/checkconf/good-update-policy5.conf b/bin/tests/system/checkconf/good-update-policy5.conf index 1f70f0c2f6..fcbf609134 100644 --- a/bin/tests/system/checkconf/good-update-policy5.conf +++ b/bin/tests/system/checkconf/good-update-policy5.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * selfwild * TXT; diff --git a/bin/tests/system/checkconf/good-update-policy6.conf b/bin/tests/system/checkconf/good-update-policy6.conf index ac43c48dda..e51c0a0484 100644 --- a/bin/tests/system/checkconf/good-update-policy6.conf +++ b/bin/tests/system/checkconf/good-update-policy6.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * selfwild . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy7.conf b/bin/tests/system/checkconf/good-update-policy7.conf index 96431a3e49..af7acfc636 100644 --- a/bin/tests/system/checkconf/good-update-policy7.conf +++ b/bin/tests/system/checkconf/good-update-policy7.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * krb5-self . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy8.conf b/bin/tests/system/checkconf/good-update-policy8.conf index cd33559dda..4ee42388d1 100644 --- a/bin/tests/system/checkconf/good-update-policy8.conf +++ b/bin/tests/system/checkconf/good-update-policy8.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * ms-self . TXT; diff --git a/bin/tests/system/checkconf/good-update-policy9.conf b/bin/tests/system/checkconf/good-update-policy9.conf index dcb5b461d9..cce3fc3888 100644 --- a/bin/tests/system/checkconf/good-update-policy9.conf +++ b/bin/tests/system/checkconf/good-update-policy9.conf @@ -10,7 +10,7 @@ */ zone "example.com" { - type master; + type primary; file "example.com.db"; update-policy { grant * ms-subdomain . TXT; diff --git a/bin/tests/system/checkconf/good-view-also-notify.conf b/bin/tests/system/checkconf/good-view-also-notify.conf index b8a46e9857..0998da0ee7 100644 --- a/bin/tests/system/checkconf/good-view-also-notify.conf +++ b/bin/tests/system/checkconf/good-view-also-notify.conf @@ -12,8 +12,8 @@ view example { also-notify { missing; }; zone "example.net" { - type slave; + type secondary; notify no; - masters { 192.168.1.1; }; + primaries { 192.168.1.1; }; }; }; diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf index 616a5441d4..2373425ad7 100644 --- a/bin/tests/system/checkconf/good.conf +++ b/bin/tests/system/checkconf/good.conf @@ -95,14 +95,14 @@ view "first" { "none"; }; zone "example1" { - type master; + type primary; file "xxx"; update-policy local; max-ixfr-ratio 20%; notify-source 10.10.10.10 port 53 dscp 55; }; zone "clone" { - type master; + type primary; file "yyy"; max-ixfr-ratio unlimited; }; @@ -114,7 +114,7 @@ view "second" { "any"; }; zone "example1" { - type master; + type primary; file "zzz"; update-policy local; zone-statistics yes; @@ -138,7 +138,7 @@ view "second" { }; zone "." { type redirect; - masters { + primaries { 1.2.3.4; }; }; @@ -157,7 +157,7 @@ view "third" { }; }; zone "dnssec" { - type master; + type primary; file "file"; allow-update { "any"; @@ -170,7 +170,7 @@ view "third" { }; zone "s" { type secondary; - masters { + primaries { 1.2.3.4; }; notify primary-only; @@ -178,7 +178,7 @@ view "third" { }; view "fourth" { zone "dnssec-test" { - type master; + type primary; file "dnssec-test.db"; parental-agents { 1.2.3.4; @@ -188,7 +188,7 @@ view "fourth" { parental-source 10.10.10.10 port 53 dscp 55; }; zone "dnssec-default" { - type master; + type primary; file "dnssec-default.db"; parental-agents { "parents"; @@ -196,31 +196,31 @@ view "fourth" { dnssec-policy "default"; }; zone "dnssec-inherit" { - type master; + type primary; file "dnssec-inherit.db"; }; zone "dnssec-none" { - type master; + type primary; file "dnssec-none.db"; dnssec-policy "none"; }; zone "dnssec-view1" { - type master; + type primary; file "dnssec-view41.db"; dnssec-policy "test"; }; zone "dnssec-view2" { - type master; + type primary; file "dnssec-view42.db"; }; zone "dnssec-view3" { - type master; + type primary; file "dnssec-view43.db"; dnssec-policy "none"; key-directory "keys"; }; zone "dnssec-view4" { - type master; + type primary; file "dnssec-view44.db"; dnssec-policy "none"; }; @@ -229,24 +229,24 @@ view "fourth" { }; view "fifth" { zone "dnssec-view1" { - type master; + type primary; file "dnssec-view51.db"; dnssec-policy "test"; }; zone "dnssec-view2" { - type master; + type primary; file "dnssec-view52.db"; dnssec-policy "test"; key-directory "keys"; }; zone "dnssec-view3" { - type master; + type primary; file "dnssec-view53.db"; dnssec-policy "default"; key-directory "keys"; }; zone "dnssec-view4" { - type master; + type primary; file "dnssec-view54.db"; dnssec-policy "none"; }; @@ -254,7 +254,7 @@ view "fifth" { }; view "chaos" chaos { zone "hostname.bind" chaos { - type master; + type primary; database "_builtin hostname"; }; }; diff --git a/bin/tests/system/checkconf/good.zonelist b/bin/tests/system/checkconf/good.zonelist index 08a5665afd..a5fbfdae18 100644 --- a/bin/tests/system/checkconf/good.zonelist +++ b/bin/tests/system/checkconf/good.zonelist @@ -1,24 +1,24 @@ -example1 IN first master -clone IN first master -example1 IN second master +example1 IN first primary +clone IN first primary +example1 IN second primary example2 IN second static-stub example3 IN second static-stub clone IN second in-view first . IN second redirect clone IN third in-view first -dnssec IN third master +dnssec IN third primary p IN third primary s IN third secondary -dnssec-test IN fourth master -dnssec-default IN fourth master -dnssec-inherit IN fourth master -dnssec-none IN fourth master -dnssec-view1 IN fourth master -dnssec-view2 IN fourth master -dnssec-view3 IN fourth master -dnssec-view4 IN fourth master -dnssec-view1 IN fifth master -dnssec-view2 IN fifth master -dnssec-view3 IN fifth master -dnssec-view4 IN fifth master -hostname.bind chaos chaos master +dnssec-test IN fourth primary +dnssec-default IN fourth primary +dnssec-inherit IN fourth primary +dnssec-none IN fourth primary +dnssec-view1 IN fourth primary +dnssec-view2 IN fourth primary +dnssec-view3 IN fourth primary +dnssec-view4 IN fourth primary +dnssec-view1 IN fifth primary +dnssec-view2 IN fifth primary +dnssec-view3 IN fifth primary +dnssec-view4 IN fifth primary +hostname.bind chaos chaos primary diff --git a/bin/tests/system/checkconf/in-view-good.conf b/bin/tests/system/checkconf/in-view-good.conf index 3161c38131..7ee67539b6 100644 --- a/bin/tests/system/checkconf/in-view-good.conf +++ b/bin/tests/system/checkconf/in-view-good.conf @@ -11,7 +11,7 @@ view internal { zone shared.example { - type master; + type primary; file "shared.example.db"; }; }; diff --git a/bin/tests/system/checkconf/inline-bad.conf b/bin/tests/system/checkconf/inline-bad.conf index 011bea91be..21a0eef06c 100644 --- a/bin/tests/system/checkconf/inline-bad.conf +++ b/bin/tests/system/checkconf/inline-bad.conf @@ -10,16 +10,16 @@ */ acl "transferees" {}; -masters "stealthMasters" {127.0.0.1;}; -masters "publicSlaves" {127.0.0.1;}; +primaries "stealthPrimaries" {127.0.0.1;}; +primaries "publicSecondaries" {127.0.0.1;}; zone "example.net" { - type slave; + type secondary; key-directory "/var/lib/bind/example.net"; auto-dnssec maintain; inline-signing yes; - masters { stealthMasters; }; + primaries { stealthPrimaries; }; notify explicit; - also-notify { publicSlaves; }; + also-notify { publicSecondaries; }; allow-transfer { localhost; transferees; }; }; diff --git a/bin/tests/system/checkconf/inline-good.conf b/bin/tests/system/checkconf/inline-good.conf index 8e3115b19c..fff69e1ab8 100644 --- a/bin/tests/system/checkconf/inline-good.conf +++ b/bin/tests/system/checkconf/inline-good.conf @@ -10,17 +10,17 @@ */ acl "transferees" {}; -masters "stealthMasters" {127.0.0.1;}; -masters "publicSlaves" {127.0.0.1;}; +primaries "stealthPrimaries" {127.0.0.1;}; +primaries "publicSecondaries" {127.0.0.1;}; zone "example.net" { - type slave; + type secondary; file "/var/cache/bind/example.net.db"; key-directory "/var/lib/bind/example.net"; auto-dnssec maintain; inline-signing yes; - masters { stealthMasters; }; + primaries { stealthPrimaries; }; notify explicit; - also-notify { publicSlaves; }; + also-notify { publicSecondaries; }; allow-transfer { localhost; transferees; }; }; diff --git a/bin/tests/system/checkconf/inline-no.conf b/bin/tests/system/checkconf/inline-no.conf index c441fa9c9a..3fc3581d5a 100644 --- a/bin/tests/system/checkconf/inline-no.conf +++ b/bin/tests/system/checkconf/inline-no.conf @@ -10,16 +10,16 @@ */ acl "transferees" {}; -masters "stealthMasters" {127.0.0.1;}; -masters "publicSlaves" {127.0.0.1;}; +primaries "stealthPrimaries" {127.0.0.1;}; +primaries "publicSecondaries" {127.0.0.1;}; zone "example.net" { - type slave; + type secondary; key-directory "/var/lib/bind/example.net"; auto-dnssec maintain; inline-signing no; - masters { stealthMasters; }; + primaries { stealthPrimaries; }; notify explicit; - also-notify { publicSlaves; }; + also-notify { publicSecondaries; }; allow-transfer { localhost; transferees; }; }; diff --git a/bin/tests/system/checkconf/kasp-and-other-dnssec-options.conf b/bin/tests/system/checkconf/kasp-and-other-dnssec-options.conf index a3eae44f73..83e2ce5d8c 100644 --- a/bin/tests/system/checkconf/kasp-and-other-dnssec-options.conf +++ b/bin/tests/system/checkconf/kasp-and-other-dnssec-options.conf @@ -12,7 +12,7 @@ include "good-kasp.conf"; zone "nsec3.net" { - type master; + type primary; file "nsec3.db"; dnssec-policy "test"; auto-dnssec maintain; diff --git a/bin/tests/system/checkconf/kasp-bad-keylen.conf b/bin/tests/system/checkconf/kasp-bad-keylen.conf index ec52436fe8..ae539df503 100644 --- a/bin/tests/system/checkconf/kasp-bad-keylen.conf +++ b/bin/tests/system/checkconf/kasp-bad-keylen.conf @@ -16,7 +16,7 @@ dnssec-policy "bad-keylen" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "badkeylen"; }; diff --git a/bin/tests/system/checkconf/kasp-bad-nsec3-alg.conf b/bin/tests/system/checkconf/kasp-bad-nsec3-alg.conf index 515d79f2bd..c6e9ffa4a6 100644 --- a/bin/tests/system/checkconf/kasp-bad-nsec3-alg.conf +++ b/bin/tests/system/checkconf/kasp-bad-nsec3-alg.conf @@ -17,7 +17,7 @@ dnssec-policy "bad-salt" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "bad-salt"; }; diff --git a/bin/tests/system/checkconf/kasp-bad-nsec3-iter.conf b/bin/tests/system/checkconf/kasp-bad-nsec3-iter.conf index 5d6e72695c..d97598c446 100644 --- a/bin/tests/system/checkconf/kasp-bad-nsec3-iter.conf +++ b/bin/tests/system/checkconf/kasp-bad-nsec3-iter.conf @@ -52,7 +52,7 @@ dnssec-policy "rsasha512-bad" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "default"; }; diff --git a/bin/tests/system/checkconf/kasp-bad-nsec3-salt.conf b/bin/tests/system/checkconf/kasp-bad-nsec3-salt.conf index 7701d3b4dd..d75bdfdb0b 100644 --- a/bin/tests/system/checkconf/kasp-bad-nsec3-salt.conf +++ b/bin/tests/system/checkconf/kasp-bad-nsec3-salt.conf @@ -14,7 +14,7 @@ dnssec-policy "bad-salt" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "bad-salt"; }; diff --git a/bin/tests/system/checkconf/kasp-ignore-keylen.conf b/bin/tests/system/checkconf/kasp-ignore-keylen.conf index b2680bd74d..141b4d4831 100644 --- a/bin/tests/system/checkconf/kasp-ignore-keylen.conf +++ b/bin/tests/system/checkconf/kasp-ignore-keylen.conf @@ -17,7 +17,7 @@ dnssec-policy "warn-length" { }; zone "example.net" { - type master; + type primary; file "example.db"; dnssec-policy "warn-length"; }; diff --git a/bin/tests/system/checkconf/max-ttl.conf b/bin/tests/system/checkconf/max-ttl.conf index 074bc2cbbd..b0a6b131bc 100644 --- a/bin/tests/system/checkconf/max-ttl.conf +++ b/bin/tests/system/checkconf/max-ttl.conf @@ -15,18 +15,18 @@ options { }; zone "maxttl1.example" { - type master; + type primary; file "maxttl-bad.db"; }; zone "maxttl2.example" { - type master; + type primary; file "maxttl-bad.db"; max-zone-ttl 300; }; zone "maxttl3.example" { - type master; + type primary; file "maxttl-bad.db"; max-zone-ttl 120; }; diff --git a/bin/tests/system/checkconf/maxttl-bad.conf b/bin/tests/system/checkconf/maxttl-bad.conf index ac4ca6548b..b5ac4b9340 100644 --- a/bin/tests/system/checkconf/maxttl-bad.conf +++ b/bin/tests/system/checkconf/maxttl-bad.conf @@ -15,7 +15,7 @@ options { }; zone "maxttl.example" { - type master; + type primary; file "maxttl-bad.db"; }; diff --git a/bin/tests/system/checkconf/notify.conf b/bin/tests/system/checkconf/notify.conf index 60c4f15dda..1b562a2d36 100644 --- a/bin/tests/system/checkconf/notify.conf +++ b/bin/tests/system/checkconf/notify.conf @@ -10,18 +10,18 @@ */ view one { - notify master-only; + notify primary-only; - # also-notify inconsistent with master-only notify option - zone "slave" { - type slave; - masters { 1.2.3.4; }; + # also-notify inconsistent with primary-only notify option + zone "secondary" { + type secondary; + primaries { 1.2.3.4; }; also-notify { 5.6.7.8; }; }; # OK - zone "master" { - type master; + zone "primary" { + type primary; file "filename"; also-notify { 5.6.7.8; }; }; @@ -31,15 +31,15 @@ view two { notify no; # also-notify inconsistent with notify option at the view level - zone "slave" { - type slave; - masters { 1.2.3.4; }; + zone "secondary" { + type secondary; + primaries { 1.2.3.4; }; also-notify { 5.6.7.8; }; }; # OK - zone "master" { - type master; + zone "primary" { + type primary; file "filename"; notify yes; also-notify { 5.6.7.8; }; @@ -48,16 +48,16 @@ view two { view three { # also-notify inconsistent with notify option at the zone level - zone "slave" { - type slave; - masters { 1.2.3.4; }; + zone "secondary" { + type secondary; + primaries { 1.2.3.4; }; notify no; also-notify { 5.6.7.8; }; }; # OK - zone "master" { - type master; + zone "primary" { + type primary; file "filename"; also-notify { 5.6.7.8; }; }; @@ -67,15 +67,15 @@ view four { also-notify { 5.6.7.8; }; # OK - zone "slave" { - type slave; - masters { 1.2.3.4; }; - notify master-only; + zone "secondary" { + type secondary; + primaries { 1.2.3.4; }; + notify primary-only; }; # OK - zone "master" { - type master; + zone "primary" { + type primary; file "filename"; notify no; }; diff --git a/bin/tests/system/checkconf/range.conf b/bin/tests/system/checkconf/range.conf index a7f94d9f50..8a4fe76c82 100644 --- a/bin/tests/system/checkconf/range.conf +++ b/bin/tests/system/checkconf/range.conf @@ -18,6 +18,6 @@ options { }; zone "example" { - type master; + type primary; file "example.db"; }; diff --git a/bin/tests/system/checkconf/warn-keydir.conf b/bin/tests/system/checkconf/warn-keydir.conf index 502a4f3d30..1833932d26 100644 --- a/bin/tests/system/checkconf/warn-keydir.conf +++ b/bin/tests/system/checkconf/warn-keydir.conf @@ -17,7 +17,7 @@ options { }; zone dummy { - type master; + type primary; file "xxxx"; key-directory "test.keydir"; }; diff --git a/bin/tests/system/checkconf/warn-maxratio1.conf b/bin/tests/system/checkconf/warn-maxratio1.conf index 5a6ed5aa1f..d01f355a34 100644 --- a/bin/tests/system/checkconf/warn-maxratio1.conf +++ b/bin/tests/system/checkconf/warn-maxratio1.conf @@ -10,7 +10,7 @@ */ zone example { - type master; + type primary; masterfile-format raw; file "example.db"; max-ixfr-ratio 101%; diff --git a/bin/tests/system/ckdnsrps.sh b/bin/tests/system/ckdnsrps.sh index 755a65075b..5ba2dea1d8 100644 --- a/bin/tests/system/ckdnsrps.sh +++ b/bin/tests/system/ckdnsrps.sh @@ -12,8 +12,8 @@ set -e # Say on stdout whether to test DNSRPS -# and create dnsrps.conf and dnsrps-slave.conf -# Note that dnsrps.conf and dnsrps-slave.conf are included in named.conf +# and create dnsrps.conf and dnsrps-secondary.conf +# Note that dnsrps.conf and dnsrps-secondary.conf are included in named.conf # and differ from dnsrpz.conf which is used by dnsrpzd. @@ -24,8 +24,8 @@ DNSRPS_CMD=../rpz/dnsrps AS_NS= TEST_DNSRPS= MCONF=dnsrps.conf -SCONF=dnsrps-slave.conf -USAGE="$0: [-xAD] [-M dnsrps.conf] [-S dnsrps-slave.conf]" +SCONF=dnsrps-secondary.conf +USAGE="$0: [-xAD] [-M dnsrps.conf] [-S dnsrps-secondary.conf]" while getopts "xADM:S:" c; do case $c in x) set -x; DEBUG=-x;; @@ -86,16 +86,16 @@ CMN=" dnsrps-options { dnsrpzd-conf ../dnsrpzd.conf dnsrpzd-args '-dddd -L stdout' log-level 3" -MASTER="$CMN" +PRIMARY="$CMN" if [ -n "$AS_NS" ]; then - MASTER="$MASTER + PRIMARY="$PRIMARY qname-as-ns yes ip-as-ns yes" fi -# write dnsrps settings for master resolver +# write dnsrps settings for primary resolver cat <>$MCONF -$MASTER }; +$PRIMARY }; EOF # write dnsrps settings for resolvers that should not start dnsrpzd @@ -123,7 +123,7 @@ else fi cp $SRC_L $CUR_L -# parse $CUR_L for the license zone name, master IP addresses, and optional +# parse $CUR_L for the license zone name, primary IP addresses, and optional # transfer-source IP addresses eval `sed -n -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'\ -e 's/.*zone *\([-a-z0-9]*.license.fastrpz.com\).*/NAME=\1/p' \ diff --git a/bin/tests/system/delzone/ns2/named.conf b/bin/tests/system/delzone/ns2/named.conf index 708754c384..5e7369c6af 100644 --- a/bin/tests/system/delzone/ns2/named.conf +++ b/bin/tests/system/delzone/ns2/named.conf @@ -28,6 +28,6 @@ zone "." { }; zone "normal.example" { - type master; + type primary; file "normal.db"; }; diff --git a/bin/tests/system/delzone/tests.sh b/bin/tests/system/delzone/tests.sh index 73b098ca33..b5534ef337 100755 --- a/bin/tests/system/delzone/tests.sh +++ b/bin/tests/system/delzone/tests.sh @@ -35,7 +35,7 @@ sys.path.insert(0, '../../../../bin/python') from isc import rndc r = rndc(('10.53.0.2', 9953), 'hmac-sha256', '1234abcd8765') for i in range(20000): - res = r.call('addzone z%d.example { type master; file "added.db"; };' % i) + res = r.call('addzone z%d.example { type primary; file "added.db"; };' % i) if 'text' in res: print ('I:n2:' + res['text']) EOF diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf index 9811b7f432..0d08e4db08 100644 --- a/bin/tests/system/dialup/ns1/named.conf +++ b/bin/tests/system/dialup/ns1/named.conf @@ -25,12 +25,12 @@ options { }; zone "." { - type master; + type primary; file "root.db"; }; zone "example." { - type master; + type primary; notify explicit; also-notify { 10.53.0.2; }; dialup yes; diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf index fdf06029e7..71c9b9269c 100644 --- a/bin/tests/system/dialup/ns2/named.conf +++ b/bin/tests/system/dialup/ns2/named.conf @@ -30,9 +30,9 @@ zone "." { }; zone "example." { - type slave; + type secondary; dialup passive; notify no; file "example.bk"; - masters { 10.53.0.1; }; + primaries { 10.53.0.1; }; }; diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf index 864b026b0c..5835d35d6a 100644 --- a/bin/tests/system/dialup/ns3/named.conf +++ b/bin/tests/system/dialup/ns3/named.conf @@ -30,9 +30,9 @@ zone "." { }; zone "example." { - type slave; + type secondary; dialup refresh; notify no; file "example.bk"; - masters { 10.53.0.2; }; + primaries { 10.53.0.2; }; }; diff --git a/bin/tests/system/dns64/ns1/named.conf1.in b/bin/tests/system/dns64/ns1/named.conf1.in index f2c3a2c473..5ea47a227d 100644 --- a/bin/tests/system/dns64/ns1/named.conf1.in +++ b/bin/tests/system/dns64/ns1/named.conf1.in @@ -56,6 +56,6 @@ zone "signed" { }; zone "ipv4only.arpa" { - type master; + type primary; file "ipv4only.arpa.db"; }; diff --git a/bin/tests/system/dns64/ns1/named.conf2.in b/bin/tests/system/dns64/ns1/named.conf2.in index 5b5b0b455c..cff13ff422 100644 --- a/bin/tests/system/dns64/ns1/named.conf2.in +++ b/bin/tests/system/dns64/ns1/named.conf2.in @@ -59,6 +59,6 @@ zone "signed" { }; zone "ipv4only.arpa" { - type master; + type primary; file "ipv4only.arpa.db"; }; diff --git a/bin/tests/system/dns64/ns1/named.conf3.in b/bin/tests/system/dns64/ns1/named.conf3.in index 2b4212cd0d..74e9163468 100644 --- a/bin/tests/system/dns64/ns1/named.conf3.in +++ b/bin/tests/system/dns64/ns1/named.conf3.in @@ -48,6 +48,6 @@ zone "signed" { }; zone "ipv4only.arpa" { - type master; + type primary; file "ipv4only.arpa.db"; }; diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in index ebfd69d69a..1709b46738 100644 --- a/bin/tests/system/dnssec/ns2/named.conf.in +++ b/bin/tests/system/dnssec/ns2/named.conf.in @@ -187,7 +187,7 @@ zone "corp" { }; zone "hours-vs-days" { - type master; + type primary; file "hours-vs-days.db.signed"; auto-dnssec maintain; /* validity 500 days, resign in 499 days */ @@ -196,7 +196,7 @@ zone "hours-vs-days" { }; zone "too-many-iterations" { - type master; + type primary; file "too-many-iterations.db.signed"; }; diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh index 88ae7f04e9..2178faccac 100644 --- a/bin/tests/system/genzone.sh +++ b/bin/tests/system/genzone.sh @@ -12,18 +12,18 @@ # # Set up a test zone # -# Usage: genzone.sh master-server-number secondary-server-number... +# Usage: genzone.sh primary-server-number secondary-server-number... # -# e.g., "genzone.sh 2 3 4" means ns2 is the master and ns3, ns4 +# e.g., "genzone.sh 2 3 4" means ns2 is the primary and ns3, ns4 # are secondaries. # -master="$1" +primary="$1" cat <> ../ns1/root.db -zone=master +zone=primary rm -f K${zone}.+*+*.key rm -f K${zone}.+*+*.private keyname=`$KEYGEN -q -a RSASHA1 -b 1024 -n zone $zone` @@ -51,7 +51,7 @@ keyname=`$KEYGEN -q -a RSASHA1 -b 1024 -n zone $zone` keyname=`$KEYGEN -q -a RSASHA1 -b 1024 -n zone -f KSK $zone` $DSFROMKEY -T 1200 $keyname >> ../ns1/root.db $SIGNER -S -O raw -L 2000042407 -o ${zone} ${zone}.db > /dev/null -cp master2.db.in updated.db +cp primary2.db.in updated.db # signatures are expired and should be regenerated on startup zone=expired diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh index 61bcd4ab02..d5bc93172b 100644 --- a/bin/tests/system/inline/setup.sh +++ b/bin/tests/system/inline/setup.sh @@ -21,15 +21,15 @@ cp ns2/bits.db.in ns2/removedkeys-secondary.db cp ns2/bits.db.in ns2/retransfer.db cp ns2/bits.db.in ns2/retransfer3.db -cp ns3/master.db.in ns3/master.db -cp ns3/master.db.in ns3/dynamic.db -cp ns3/master.db.in ns3/updated.db -cp ns3/master.db.in ns3/unsupported.db -cp ns3/master.db.in ns3/expired.db -cp ns3/master.db.in ns3/nsec3.db -cp ns3/master.db.in ns3/externalkey.db -cp ns3/master.db.in ns3/delayedkeys.db -cp ns3/master.db.in ns3/removedkeys-primary.db +cp ns3/primary.db.in ns3/primary.db +cp ns3/primary.db.in ns3/dynamic.db +cp ns3/primary.db.in ns3/updated.db +cp ns3/primary.db.in ns3/unsupported.db +cp ns3/primary.db.in ns3/expired.db +cp ns3/primary.db.in ns3/nsec3.db +cp ns3/primary.db.in ns3/externalkey.db +cp ns3/primary.db.in ns3/delayedkeys.db +cp ns3/primary.db.in ns3/removedkeys-primary.db cp ns3/include.db.in ns3/include.db mkdir ns3/removedkeys diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 3bfac90f0d..9a880cd73f 100755 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/tests.sh @@ -289,7 +289,7 @@ ret=0 for i in 1 2 3 4 5 6 7 8 9 10 do ret=0 - $RNDCCMD 10.53.0.3 signing -list master > signing.out.test$n 2>&1 + $RNDCCMD 10.53.0.3 signing -list primary > signing.out.test$n 2>&1 keys=`grep '^Done signing' signing.out.test$n | wc -l` [ $keys = 2 ] || ret=1 if [ $ret = 0 ]; then break; fi @@ -301,17 +301,17 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "checking removal of private type record via 'rndc signing -clear' (primary) ($n)" ret=0 -$RNDCCMD 10.53.0.3 signing -list master > signing.out.test$n 2>&1 +$RNDCCMD 10.53.0.3 signing -list primary > signing.out.test$n 2>&1 keys=`sed -n -e 's/Done signing with key \(.*\)$/\1/p' signing.out.test$n` for key in $keys; do - $RNDCCMD 10.53.0.3 signing -clear ${key} master > /dev/null || ret=1 + $RNDCCMD 10.53.0.3 signing -clear ${key} primary > /dev/null || ret=1 break; # We only want to remove 1 record for now. done 2>&1 |sed 's/^/ns3 /' | cat_i for i in 1 2 3 4 5 6 7 8 9 do ans=0 - $RNDCCMD 10.53.0.3 signing -list master > signing.out.test$n 2>&1 + $RNDCCMD 10.53.0.3 signing -list primary > signing.out.test$n 2>&1 num=`grep "Done signing with" signing.out.test$n | wc -l` [ $num = 1 ] && break sleep 1 @@ -324,7 +324,7 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "checking private type was properly signed (primary) ($n)" ret=0 -$DIG $DIGOPTS @10.53.0.6 master TYPE65534 > dig.out.ns6.test$n +$DIG $DIGOPTS @10.53.0.6 primary TYPE65534 > dig.out.ns6.test$n grep "ANSWER: 2," dig.out.ns6.test$n > /dev/null || ret=1 grep "flags:.* ad[ ;]" dig.out.ns6.test$n > /dev/null || ret=1 @@ -334,11 +334,11 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "checking removal of remaining private type record via 'rndc signing -clear' (primary) ($n)" ret=0 -$RNDCCMD 10.53.0.3 signing -clear all master > /dev/null || ret=1 +$RNDCCMD 10.53.0.3 signing -clear all primary > /dev/null || ret=1 for i in 1 2 3 4 5 6 7 8 9 10 do ans=0 - $RNDCCMD 10.53.0.3 signing -list master > signing.out.test$n 2>&1 + $RNDCCMD 10.53.0.3 signing -list primary > signing.out.test$n 2>&1 grep "No signing records found" signing.out.test$n > /dev/null || ans=1 [ $ans = 1 ] || break sleep 1 @@ -351,12 +351,12 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check adding of record to unsigned primary ($n)" ret=0 -cp ns3/master2.db.in ns3/master.db -rndc_reload ns3 10.53.0.3 master +cp ns3/primary2.db.in ns3/primary.db +rndc_reload ns3 10.53.0.3 primary for i in 1 2 3 4 5 6 7 8 9 do ans=0 - $DIG $DIGOPTS @10.53.0.3 e.master A > dig.out.ns3.test$n + $DIG $DIGOPTS @10.53.0.3 e.primary A > dig.out.ns3.test$n grep "10.0.0.5" dig.out.ns3.test$n > /dev/null || ans=1 grep "ANSWER: 2," dig.out.ns3.test$n > /dev/null || ans=1 [ $ans = 1 ] || break @@ -369,10 +369,10 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check adding record fails when SOA serial not changed ($n)" ret=0 -echo "c A 10.0.0.3" >> ns3/master.db +echo "c A 10.0.0.3" >> ns3/primary.db rndc_reload ns3 10.53.0.3 sleep 1 -$DIG $DIGOPTS @10.53.0.3 c.master A > dig.out.ns3.test$n +$DIG $DIGOPTS @10.53.0.3 c.primary A > dig.out.ns3.test$n grep "NXDOMAIN" dig.out.ns3.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -380,12 +380,12 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check adding record works after updating SOA serial ($n)" ret=0 -cp ns3/master3.db.in ns3/master.db -$RNDCCMD 10.53.0.3 reload master 2>&1 | sed 's/^/ns3 /' | cat_i +cp ns3/primary3.db.in ns3/primary.db +$RNDCCMD 10.53.0.3 reload primary 2>&1 | sed 's/^/ns3 /' | cat_i for i in 1 2 3 4 5 6 7 8 9 do ans=0 - $DIG $DIGOPTS @10.53.0.3 c.master A > dig.out.ns3.test$n + $DIG $DIGOPTS @10.53.0.3 c.primary A > dig.out.ns3.test$n grep "10.0.0.3" dig.out.ns3.test$n > /dev/null || ans=1 grep "ANSWER: 2," dig.out.ns3.test$n > /dev/null || ans=1 [ $ans = 1 ] || break @@ -398,7 +398,7 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check the added record was properly signed ($n)" ret=0 -$DIG $DIGOPTS @10.53.0.3 e.master A > dig.out.ns6.test$n +$DIG $DIGOPTS @10.53.0.3 e.primary A > dig.out.ns6.test$n grep "10.0.0.5" dig.out.ns6.test$n > /dev/null || ans=1 grep "ANSWER: 2," dig.out.ns6.test$n > /dev/null || ans=1 grep "flags:.* ad[ ;]" dig.out.ns6.test$n > /dev/null || ans=1 @@ -432,7 +432,7 @@ $DIG $DIGOPTS @10.53.0.3 e.updated A > dig.out.ns3.test$n grep "status: NOERROR" dig.out.ns3.test$n > /dev/null || ret=1 grep "ANSWER: 2," dig.out.ns3.test$n > /dev/null || ret=1 # updated.db.signed.jnl should exist, should have the source serial -# of master2.db, and should show a minimal diff: no more than 8 added +# of primary2.db, and should show a minimal diff: no more than 8 added # records (SOA/RRSIG, 2 x NSEC/RRSIG, A/RRSIG), and 4 removed records # (SOA/RRSIG, NSEC/RRSIG). $JOURNALPRINT ns3/updated.db.signed.jnl >journalprint.out.test$n @@ -895,8 +895,8 @@ if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` echo_i "update SOA record while stopped" -cp ns3/master4.db.in ns3/master.db -rm ns3/master.db.jnl +cp ns3/primary4.db.in ns3/primary.db +rm ns3/primary.db.jnl n=`expr $n + 1` echo_i "restart bump in the wire signer server ($n)" @@ -911,7 +911,7 @@ ret=0 for i in 1 2 3 4 5 6 7 8 9 do ans=0 - $DIG $DIGOPTS @10.53.0.3 master SOA > dig.out.ns3.test$n + $DIG $DIGOPTS @10.53.0.3 primary SOA > dig.out.ns3.test$n grep "hostmaster" dig.out.ns3.test$n > /dev/null || ans=1 grep "ANSWER: 2," dig.out.ns3.test$n > /dev/null || ans=1 [ $ans = 1 ] || break @@ -924,16 +924,16 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check that reloading all zones does not cause zone maintenance to cease for inline-signed zones ($n)" ret=1 -# Ensure "rndc reload" attempts to load ns3/master.db by waiting 1 second so +# Ensure "rndc reload" attempts to load ns3/primary.db by waiting 1 second so # that the file modification time has no possibility of being equal to # the one stored during server startup. sleep 1 nextpart ns3/named.run > /dev/null -cp ns3/master5.db.in ns3/master.db +cp ns3/primary5.db.in ns3/primary.db rndc_reload ns3 10.53.0.3 for i in 1 2 3 4 5 6 7 8 9 10 do - if nextpart ns3/named.run | grep "zone master.*sending notifies" > /dev/null; then + if nextpart ns3/named.run | grep "zone primary.*sending notifies" > /dev/null; then ret=0 break fi @@ -941,7 +941,7 @@ do done # Sanity check: file updates should be reflected in the signed zone, # i.e. SOA RNAME should no longer be set to "hostmaster". -$DIG $DIGOPTS @10.53.0.3 master SOA > dig.out.ns3.test$n || ret=1 +$DIG $DIGOPTS @10.53.0.3 primary SOA > dig.out.ns3.test$n || ret=1 grep "hostmaster" dig.out.ns3.test$n > /dev/null && ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -949,10 +949,10 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check that reloading errors prevent synchronization ($n)" ret=1 -$DIG $DIGOPTS +short @10.53.0.3 master SOA > dig.out.ns3.test$n.1 || ret=1 +$DIG $DIGOPTS +short @10.53.0.3 primary SOA > dig.out.ns3.test$n.1 || ret=1 sleep 1 nextpart ns3/named.run > /dev/null -cp ns3/master6.db.in ns3/master.db +cp ns3/primary6.db.in ns3/primary.db rndc_reload ns3 10.53.0.3 for i in 1 2 3 4 5 6 7 8 9 10 do @@ -964,7 +964,7 @@ do sleep 1 done # Sanity check: the SOA record should be unchanged -$DIG $DIGOPTS +short @10.53.0.3 master SOA > dig.out.ns3.test$n.2 || ret=1 +$DIG $DIGOPTS +short @10.53.0.3 primary SOA > dig.out.ns3.test$n.2 || ret=1 $DIFF dig.out.ns3.test$n.1 dig.out.ns3.test$n.2 > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -972,15 +972,15 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check inline-signing with an include file ($n)" ret=0 -$DIG $DIGOPTS +short @10.53.0.3 master SOA > dig.out.ns3.test$n.1 || ret=1 +$DIG $DIGOPTS +short @10.53.0.3 primary SOA > dig.out.ns3.test$n.1 || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` sleep 1 nextpart ns3/named.run > /dev/null -cp ns3/master7.db.in ns3/master.db +cp ns3/primary7.db.in ns3/primary.db rndc_reload ns3 10.53.0.3 _includefile_loaded() { - $DIG $DIGOPTS @10.53.0.3 f.master A > dig.out.ns3.test$n + $DIG $DIGOPTS @10.53.0.3 f.primary A > dig.out.ns3.test$n grep "status: NOERROR" dig.out.ns3.test$n > /dev/null || return 1 grep "ANSWER: 2," dig.out.ns3.test$n > /dev/null || return 1 grep "10\.0\.0\.7" dig.out.ns3.test$n > /dev/null || return 1 @@ -988,7 +988,7 @@ _includefile_loaded() { } retry_quiet 10 _includefile_loaded # Sanity check: the SOA record should be changed -$DIG $DIGOPTS +short @10.53.0.3 master SOA > dig.out.ns3.test$n.2 || ret=1 +$DIG $DIGOPTS +short @10.53.0.3 primary SOA > dig.out.ns3.test$n.2 || ret=1 $DIFF dig.out.ns3.test$n.1 dig.out.ns3.test$n.2 > /dev/null && ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` @@ -1398,7 +1398,7 @@ status=`expr $status + $ret` n=`expr $n + 1` echo_i "check that zonestatus reports 'type: primary' for an inline primary zone ($n)" ret=0 -$RNDCCMD 10.53.0.3 zonestatus master > rndc.out.ns3.test$n +$RNDCCMD 10.53.0.3 zonestatus primary > rndc.out.ns3.test$n grep "type: primary" rndc.out.ns3.test$n > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` diff --git a/bin/tests/system/kasp/ns3/named.conf.in b/bin/tests/system/kasp/ns3/named.conf.in index a2731099e9..7e2c1dd925 100644 --- a/bin/tests/system/kasp/ns3/named.conf.in +++ b/bin/tests/system/kasp/ns3/named.conf.in @@ -80,7 +80,7 @@ zone "manual-rollover.kasp" { dnssec-policy "manual-rollover"; }; -/* A master zone with dnssec-policy, no keys created. */ +/* A primary zone with dnssec-policy, no keys created. */ zone "rsasha1.kasp" { type primary; file "rsasha1.kasp.db"; @@ -107,7 +107,7 @@ zone "insecure.kasp" { dnssec-policy "insecure"; }; -/* A master zone with dnssec-policy but keys already created. */ +/* A primary zone with dnssec-policy but keys already created. */ zone "dnssec-keygen.kasp" { type primary; file "dnssec-keygen.kasp.db"; diff --git a/bin/tests/system/kasp/ns6/named.conf.in b/bin/tests/system/kasp/ns6/named.conf.in index 29cc010d14..f8f903c6cf 100644 --- a/bin/tests/system/kasp/ns6/named.conf.in +++ b/bin/tests/system/kasp/ns6/named.conf.in @@ -38,20 +38,20 @@ controls { /* These zones are going insecure. */ zone "step1.going-insecure.kasp" { - type master; + type primary; file "step1.going-insecure.kasp.db"; dnssec-policy "unsigning"; }; zone "step1.going-insecure-dynamic.kasp" { - type master; + type primary; file "step1.going-insecure-dynamic.kasp.db"; dnssec-policy "unsigning"; allow-update { any; }; }; zone "step1.going-straight-to-none.kasp" { - type master; + type primary; file "step1.going-straight-to-none.kasp.db"; dnssec-policy "default"; }; diff --git a/bin/tests/system/kasp/ns6/named2.conf.in b/bin/tests/system/kasp/ns6/named2.conf.in index 91af68325b..f2403565c4 100644 --- a/bin/tests/system/kasp/ns6/named2.conf.in +++ b/bin/tests/system/kasp/ns6/named2.conf.in @@ -37,33 +37,33 @@ controls { /* Zones for testing going insecure. */ zone "step1.going-insecure.kasp" { - type master; + type primary; file "step1.going-insecure.kasp.db"; dnssec-policy "insecure"; }; zone "step2.going-insecure.kasp" { - type master; + type primary; file "step2.going-insecure.kasp.db"; dnssec-policy "insecure"; }; zone "step1.going-insecure-dynamic.kasp" { - type master; + type primary; file "step1.going-insecure-dynamic.kasp.db"; dnssec-policy "insecure"; allow-update { any; }; }; zone "step2.going-insecure-dynamic.kasp" { - type master; + type primary; file "step2.going-insecure-dynamic.kasp.db"; dnssec-policy "insecure"; allow-update { any; }; }; zone "step1.going-straight-to-none.kasp" { - type master; + type primary; file "step1.going-straight-to-none.kasp.db"; dnssec-policy "none"; }; diff --git a/bin/tests/system/keymgr2kasp/ns4/named.conf.in b/bin/tests/system/keymgr2kasp/ns4/named.conf.in index a74f3851cc..031ec80976 100644 --- a/bin/tests/system/keymgr2kasp/ns4/named.conf.in +++ b/bin/tests/system/keymgr2kasp/ns4/named.conf.in @@ -47,7 +47,7 @@ view "ext" { match-clients { key "external"; }; zone "view-rsasha256.kasp" { - type master; + type primary; file "view-rsasha256.kasp.ext.db"; auto-dnssec maintain; inline-signing yes; @@ -60,7 +60,7 @@ view "int" { match-clients { key "internal"; }; zone "view-rsasha256.kasp" { - type master; + type primary; file "view-rsasha256.kasp.int.db"; auto-dnssec maintain; inline-signing yes; diff --git a/bin/tests/system/keymgr2kasp/ns4/named2.conf.in b/bin/tests/system/keymgr2kasp/ns4/named2.conf.in index d9a23f8657..bcfef239a9 100644 --- a/bin/tests/system/keymgr2kasp/ns4/named2.conf.in +++ b/bin/tests/system/keymgr2kasp/ns4/named2.conf.in @@ -68,7 +68,7 @@ view "ext" { match-clients { key "external"; }; zone "view-rsasha256.kasp" { - type master; + type primary; file "view-rsasha256.kasp.ext.db"; dnssec-policy "rsasha256"; }; @@ -78,7 +78,7 @@ view "int" { match-clients { key "internal"; }; zone "view-rsasha256.kasp" { - type master; + type primary; file "view-rsasha256.kasp.int.db"; dnssec-policy "rsasha256"; }; diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh index 69289e8844..e8a00eaeb7 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/tests.sh @@ -139,7 +139,7 @@ digcomp dig.out.ns2.test$n dig.out.ns3.test$n || ret=1 [ $ret = 0 ] || echo_i "failed" status=`expr $ret + $status` -echo_i "stopping master and restarting with example4 then waiting up to 45 seconds" +echo_i "stopping primary and restarting with example4 then waiting up to 45 seconds" stop_server notify ns2 rm -f ns2/example.db @@ -187,7 +187,7 @@ digcomp dig.out.ns2.test$n dig.out.ns3.test$n || ret=1 status=`expr $ret + $status` n=`expr $n + 1` -echo_i "checking notify to alternate port with master inheritance ($n)" +echo_i "checking notify to alternate port with primary server inheritance ($n)" $NSUPDATE << EOF server 10.53.0.2 ${PORT} zone x21 diff --git a/bin/tests/system/nsupdate/ns9/named.conf.in b/bin/tests/system/nsupdate/ns9/named.conf.in index e80f6775af..93671cffec 100644 --- a/bin/tests/system/nsupdate/ns9/named.conf.in +++ b/bin/tests/system/nsupdate/ns9/named.conf.in @@ -53,7 +53,7 @@ zone "example.com" { }; zone "denyname.example" { - type master; + type primary; file "denyname.example.db"; update-policy { deny subkey name denyname.example; diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh index 58a4eece4b..6e0d91c897 100644 --- a/bin/tests/system/nzd2nzf/tests.sh +++ b/bin/tests/system/nzd2nzf/tests.sh @@ -30,7 +30,7 @@ status=$((status+ret)) n=$((n+1)) echo_i "adding a new zone into default NZD using rndc addzone ($n)" -rndccmd 10.53.0.1 addzone "added.example { type master; file \"added.db\"; +rndccmd 10.53.0.1 addzone "added.example { type primary; file \"added.db\"; };" 2>&1 | sed 's/^/I:ns1 /' | cat_i sleep 2 @@ -53,7 +53,7 @@ status=$((status+ret)) n=$((n+1)) echo_i "checking that _default.nzf contains the expected content ($n)" -grep 'zone "added.example" { type master; file "added.db"; };' ns1/_default.nzf > /dev/null || ret=1 +grep 'zone "added.example" { type primary; file "added.db"; };' ns1/_default.nzf > /dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status+ret)) diff --git a/bin/tests/system/redirect/conf/good2.conf b/bin/tests/system/redirect/conf/good2.conf index a01d645673..92f564dc23 100644 --- a/bin/tests/system/redirect/conf/good2.conf +++ b/bin/tests/system/redirect/conf/good2.conf @@ -10,8 +10,8 @@ */ zone "." { - type master; - file "master.db"; + type primary; + file "primary.db"; }; zone "." { diff --git a/bin/tests/system/rpz/dnsrpzd-license.conf b/bin/tests/system/rpz/dnsrpzd-license.conf index 745c7c9757..2891fe6e2c 100644 --- a/bin/tests/system/rpz/dnsrpzd-license.conf +++ b/bin/tests/system/rpz/dnsrpzd-license.conf @@ -1,5 +1,5 @@ zone isc.license.fastrpz.com { - masters port 53 { + primaries port 53 { KEY farsight_fastrpz_license 104.244.14.176; KEY farsight_fastrpz_license 2620:11c:f008::176; }; diff --git a/bin/tests/system/rpz/dnsrpzd.conf.in b/bin/tests/system/rpz/dnsrpzd.conf.in index 667f782d43..3187f483ee 100644 --- a/bin/tests/system/rpz/dnsrpzd.conf.in +++ b/bin/tests/system/rpz/dnsrpzd.conf.in @@ -41,20 +41,20 @@ zone "bl17" {type primary; file "../ns5/bl.db"; }; zone "bl18" {type primary; file "../ns5/bl.db"; }; zone "bl19" {type primary; file "../ns5/bl.db"; }; -zone "bl" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-2" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-given" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-passthru" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-no-op" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-disabled" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-nodata" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-nxdomain" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-cname" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-wildcname" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-garden" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-drop" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl-tcp-only" {type slave; masters port @PORT@ { 10.53.0.3; }; }; -zone "bl.tld2" {type slave; masters port @PORT@ { 10.53.0.3; }; }; +zone "bl" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-2" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-given" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-passthru" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-no-op" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-disabled" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-nodata" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-nxdomain" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-cname" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-wildcname" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-garden" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-drop" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl-tcp-only" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; +zone "bl.tld2" {type secondary; primaries port @PORT@ { 10.53.0.3; }; }; -zone "policy1" {type slave; masters port @PORT@ { 10.53.0.6; }; }; -zone "policy2" {type slave; masters port @PORT@ { 10.53.0.7; }; }; +zone "policy1" {type secondary; primaries port @PORT@ { 10.53.0.6; }; }; +zone "policy2" {type secondary; primaries port @PORT@ { 10.53.0.7; }; }; diff --git a/bin/tests/system/rpz/ns5/named.conf.in b/bin/tests/system/rpz/ns5/named.conf.in index a72dc14fe8..1e1859aa19 100644 --- a/bin/tests/system/rpz/ns5/named.conf.in +++ b/bin/tests/system/rpz/ns5/named.conf.in @@ -34,7 +34,7 @@ options { # turn rpz on or off include "rpz-switch"; - include "../dnsrps-slave.conf"; + include "../dnsrps-secondary.conf"; }; key rndc_key { diff --git a/bin/tests/system/rpz/ns6/named.conf.in b/bin/tests/system/rpz/ns6/named.conf.in index e036480bf9..de159c22c3 100644 --- a/bin/tests/system/rpz/ns6/named.conf.in +++ b/bin/tests/system/rpz/ns6/named.conf.in @@ -33,7 +33,7 @@ options { nsip-enable yes nsdname-enable yes; - include "../dnsrps-slave.conf"; + include "../dnsrps-secondary.conf"; }; logging { category rpz { default_debug; }; }; diff --git a/bin/tests/system/rpz/ns7/named.conf.in b/bin/tests/system/rpz/ns7/named.conf.in index 8fa0951012..8162cf75ea 100644 --- a/bin/tests/system/rpz/ns7/named.conf.in +++ b/bin/tests/system/rpz/ns7/named.conf.in @@ -30,7 +30,7 @@ options { nsdname-enable yes min-update-interval 0; - include "../dnsrps-slave.conf"; + include "../dnsrps-secondary.conf"; }; logging { category rpz { default_debug; }; }; diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh index 93cb3ecb73..42b360c433 100644 --- a/bin/tests/system/rpz/setup.sh +++ b/bin/tests/system/rpz/setup.sh @@ -55,7 +55,7 @@ copy_setports ns9/named.conf.in ns9/named.conf copy_setports dnsrpzd.conf.in dnsrpzd.conf # decide whether to test DNSRPS -# Note that dnsrps.conf and dnsrps-slave.conf are included in named.conf +# Note that dnsrps.conf and dnsrps-secondary.conf are included in named.conf # and differ from dnsrpz.conf which is used by dnsrpzd. $SHELL ../ckdnsrps.sh -A $TEST_DNSRPS $DEBUG test -z "`grep 'dnsrps-enable yes' dnsrps.conf`" && TEST_DNSRPS= diff --git a/bin/tests/system/rpzrecurse/.gitignore b/bin/tests/system/rpzrecurse/.gitignore index ab57b95862..3132239b3c 100644 --- a/bin/tests/system/rpzrecurse/.gitignore +++ b/bin/tests/system/rpzrecurse/.gitignore @@ -6,7 +6,7 @@ /ns4/named.conf /ans5/ans.pl /ans5/ans.pid -/dnsrps-slave.conf +/dnsrps-secondary.conf /dnsrps.conf /dnsrpzd.conf session.key diff --git a/bin/tests/system/rpzrecurse/ns1/named.conf.in b/bin/tests/system/rpzrecurse/ns1/named.conf.in index 65406a12ae..a0a3a3c680 100644 --- a/bin/tests/system/rpzrecurse/ns1/named.conf.in +++ b/bin/tests/system/rpzrecurse/ns1/named.conf.in @@ -33,41 +33,41 @@ controls { }; zone "." { - type master; + type primary; file "root.db"; }; zone "test.example.org" { - type master; + type primary; file "example.db"; }; zone "l0" { - type master; + type primary; file "db.l0"; }; zone "l1.l0" { - type master; + type primary; file "db.l1.l0"; }; zone "l2.l1.l0" { - type master; + type primary; file "does-not-exist"; }; zone "test1.example.net" { - type master; + type primary; file "test1.example.net.db"; }; zone "test2.example.net" { - type master; + type primary; file "test2.example.net.db"; }; zone "example.com" { - type master; + type primary; file "example.com.db"; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf index c8ef0aee43..a520b9fbc7 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.clientip.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.clientip.conf @@ -27,8 +27,8 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "clientip1" { type master; file "db.clientip1"; }; - zone "clientip2" { type master; file "db.clientip2"; }; + zone "clientip1" { type primary; file "db.clientip1"; }; + zone "clientip2" { type primary; file "db.clientip2"; }; recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf index c3c6164326..6e8edb3786 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.clientip2.conf @@ -28,7 +28,7 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "clientip21" { type master; file "db.clientip21"; }; + zone "clientip21" { type primary; file "db.clientip21"; }; recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in index 6820820858..dbac13d3cc 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in +++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in @@ -25,7 +25,7 @@ options { querylog yes; # let ns3 start dnsrpzd - include "../dnsrps-slave.conf"; + include "../dnsrps-secondary.conf"; }; key rndc_key { diff --git a/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf b/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf index fe5935517c..41a800ec61 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf @@ -24,5 +24,5 @@ view "recursive" { }; # policy zones to be tested - zone "invalidprefixlength" { type master; file "db.invalidprefixlength"; }; + zone "invalidprefixlength" { type primary; file "db.invalidprefixlength"; }; }; diff --git a/bin/tests/system/rpzrecurse/ns2/named.log.conf b/bin/tests/system/rpzrecurse/ns2/named.log.conf index 10c66a3e6c..999a4075bc 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.log.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.log.conf @@ -28,9 +28,9 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "log1" { type master; file "db.log1"; }; - zone "log2" { type master; file "db.log2"; }; - zone "log3" { type master; file "db.log3"; }; + zone "log1" { type primary; file "db.log1"; }; + zone "log2" { type primary; file "db.log2"; }; + zone "log3" { type primary; file "db.log3"; }; recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.max.conf b/bin/tests/system/rpzrecurse/ns2/named.max.conf index a710793e23..ab4433518a 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.max.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.max.conf @@ -89,70 +89,70 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "max1" { type master; file "db.max1.local"; }; - zone "max2" { type master; file "db.max2.local"; }; - zone "max3" { type master; file "db.max3.local"; }; - zone "max4" { type master; file "db.max4.local"; }; - zone "max5" { type master; file "db.max5.local"; }; - zone "max6" { type master; file "db.max6.local"; }; - zone "max7" { type master; file "db.max7.local"; }; - zone "max8" { type master; file "db.max8.local"; }; - zone "max9" { type master; file "db.max9.local"; }; - zone "max10" { type master; file "db.max10.local"; }; - zone "max11" { type master; file "db.max11.local"; }; - zone "max12" { type master; file "db.max12.local"; }; - zone "max13" { type master; file "db.max13.local"; }; - zone "max14" { type master; file "db.max14.local"; }; - zone "max15" { type master; file "db.max15.local"; }; - zone "max16" { type master; file "db.max16.local"; }; - zone "max17" { type master; file "db.max17.local"; }; - zone "max18" { type master; file "db.max18.local"; }; - zone "max19" { type master; file "db.max19.local"; }; - zone "max20" { type master; file "db.max20.local"; }; - zone "max21" { type master; file "db.max21.local"; }; - zone "max22" { type master; file "db.max22.local"; }; - zone "max23" { type master; file "db.max23.local"; }; - zone "max24" { type master; file "db.max24.local"; }; - zone "max25" { type master; file "db.max25.local"; }; - zone "max26" { type master; file "db.max26.local"; }; - zone "max27" { type master; file "db.max27.local"; }; - zone "max28" { type master; file "db.max28.local"; }; - zone "max29" { type master; file "db.max29.local"; }; - zone "max30" { type master; file "db.max30.local"; }; - zone "max31" { type master; file "db.max31.local"; }; - zone "max32" { type master; file "db.max32.local"; }; - zone "max33" { type master; file "db.max33.local"; }; - zone "max34" { type master; file "db.max34.local"; }; - zone "max35" { type master; file "db.max35.local"; }; - zone "max36" { type master; file "db.max36.local"; }; - zone "max37" { type master; file "db.max37.local"; }; - zone "max38" { type master; file "db.max38.local"; }; - zone "max39" { type master; file "db.max39.local"; }; - zone "max40" { type master; file "db.max40.local"; }; - zone "max41" { type master; file "db.max41.local"; }; - zone "max42" { type master; file "db.max42.local"; }; - zone "max43" { type master; file "db.max43.local"; }; - zone "max44" { type master; file "db.max44.local"; }; - zone "max45" { type master; file "db.max45.local"; }; - zone "max46" { type master; file "db.max46.local"; }; - zone "max47" { type master; file "db.max47.local"; }; - zone "max48" { type master; file "db.max48.local"; }; - zone "max49" { type master; file "db.max49.local"; }; - zone "max50" { type master; file "db.max50.local"; }; - zone "max51" { type master; file "db.max51.local"; }; - zone "max52" { type master; file "db.max52.local"; }; - zone "max53" { type master; file "db.max53.local"; }; - zone "max54" { type master; file "db.max54.local"; }; - zone "max55" { type master; file "db.max55.local"; }; - zone "max56" { type master; file "db.max56.local"; }; - zone "max57" { type master; file "db.max57.local"; }; - zone "max58" { type master; file "db.max58.local"; }; - zone "max59" { type master; file "db.max59.local"; }; - zone "max60" { type master; file "db.max60.local"; }; - zone "max61" { type master; file "db.max61.local"; }; - zone "max62" { type master; file "db.max62.local"; }; - zone "max63" { type master; file "db.max63.local"; }; - zone "max64" { type master; file "db.max64.local"; }; + zone "max1" { type primary; file "db.max1.local"; }; + zone "max2" { type primary; file "db.max2.local"; }; + zone "max3" { type primary; file "db.max3.local"; }; + zone "max4" { type primary; file "db.max4.local"; }; + zone "max5" { type primary; file "db.max5.local"; }; + zone "max6" { type primary; file "db.max6.local"; }; + zone "max7" { type primary; file "db.max7.local"; }; + zone "max8" { type primary; file "db.max8.local"; }; + zone "max9" { type primary; file "db.max9.local"; }; + zone "max10" { type primary; file "db.max10.local"; }; + zone "max11" { type primary; file "db.max11.local"; }; + zone "max12" { type primary; file "db.max12.local"; }; + zone "max13" { type primary; file "db.max13.local"; }; + zone "max14" { type primary; file "db.max14.local"; }; + zone "max15" { type primary; file "db.max15.local"; }; + zone "max16" { type primary; file "db.max16.local"; }; + zone "max17" { type primary; file "db.max17.local"; }; + zone "max18" { type primary; file "db.max18.local"; }; + zone "max19" { type primary; file "db.max19.local"; }; + zone "max20" { type primary; file "db.max20.local"; }; + zone "max21" { type primary; file "db.max21.local"; }; + zone "max22" { type primary; file "db.max22.local"; }; + zone "max23" { type primary; file "db.max23.local"; }; + zone "max24" { type primary; file "db.max24.local"; }; + zone "max25" { type primary; file "db.max25.local"; }; + zone "max26" { type primary; file "db.max26.local"; }; + zone "max27" { type primary; file "db.max27.local"; }; + zone "max28" { type primary; file "db.max28.local"; }; + zone "max29" { type primary; file "db.max29.local"; }; + zone "max30" { type primary; file "db.max30.local"; }; + zone "max31" { type primary; file "db.max31.local"; }; + zone "max32" { type primary; file "db.max32.local"; }; + zone "max33" { type primary; file "db.max33.local"; }; + zone "max34" { type primary; file "db.max34.local"; }; + zone "max35" { type primary; file "db.max35.local"; }; + zone "max36" { type primary; file "db.max36.local"; }; + zone "max37" { type primary; file "db.max37.local"; }; + zone "max38" { type primary; file "db.max38.local"; }; + zone "max39" { type primary; file "db.max39.local"; }; + zone "max40" { type primary; file "db.max40.local"; }; + zone "max41" { type primary; file "db.max41.local"; }; + zone "max42" { type primary; file "db.max42.local"; }; + zone "max43" { type primary; file "db.max43.local"; }; + zone "max44" { type primary; file "db.max44.local"; }; + zone "max45" { type primary; file "db.max45.local"; }; + zone "max46" { type primary; file "db.max46.local"; }; + zone "max47" { type primary; file "db.max47.local"; }; + zone "max48" { type primary; file "db.max48.local"; }; + zone "max49" { type primary; file "db.max49.local"; }; + zone "max50" { type primary; file "db.max50.local"; }; + zone "max51" { type primary; file "db.max51.local"; }; + zone "max52" { type primary; file "db.max52.local"; }; + zone "max53" { type primary; file "db.max53.local"; }; + zone "max54" { type primary; file "db.max54.local"; }; + zone "max55" { type primary; file "db.max55.local"; }; + zone "max56" { type primary; file "db.max56.local"; }; + zone "max57" { type primary; file "db.max57.local"; }; + zone "max58" { type primary; file "db.max58.local"; }; + zone "max59" { type primary; file "db.max59.local"; }; + zone "max60" { type primary; file "db.max60.local"; }; + zone "max61" { type primary; file "db.max61.local"; }; + zone "max62" { type primary; file "db.max62.local"; }; + zone "max63" { type primary; file "db.max63.local"; }; + zone "max64" { type primary; file "db.max64.local"; }; recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf index 963e3b0e8a..1da85df5d9 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf @@ -26,7 +26,7 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "wildcard1" { type master; file "db.wildcard1"; }; + zone "wildcard1" { type primary; file "db.wildcard1"; }; recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf index f758b3a012..b0f51de0c5 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf @@ -27,8 +27,8 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "wildcard2a" { type master; file "db.wildcard2a"; }; - zone "wildcard2b" { type master; file "db.wildcard2b"; }; + zone "wildcard2a" { type primary; file "db.wildcard2a"; }; + zone "wildcard2b" { type primary; file "db.wildcard2b"; }; recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf index bb8555cd04..c0b3f0ccf0 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf @@ -26,7 +26,7 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "wildcard3" { type master; file "db.wildcard3"; }; + zone "wildcard3" { type primary; file "db.wildcard3"; }; recursion yes; dnssec-validation yes; diff --git a/bin/tests/system/rpzrecurse/ns2/named.wildcard4.conf b/bin/tests/system/rpzrecurse/ns2/named.wildcard4.conf index 266d074d70..41dec42e93 100644 --- a/bin/tests/system/rpzrecurse/ns2/named.wildcard4.conf +++ b/bin/tests/system/rpzrecurse/ns2/named.wildcard4.conf @@ -22,8 +22,8 @@ view "recursive" { nsip-enable yes; # policy zones to be tested - zone "passthru.zone" { type master; file "db.passthru"; }; - zone "given.zone" { type master; file "db.given"; }; + zone "passthru.zone" { type primary; file "db.passthru"; }; + zone "given.zone" { type primary; file "db.given"; }; zone "." { type hint; diff --git a/bin/tests/system/rpzrecurse/ns3/named1.conf.in b/bin/tests/system/rpzrecurse/ns3/named1.conf.in index 957d911c8f..ff0a8ce43e 100644 --- a/bin/tests/system/rpzrecurse/ns3/named1.conf.in +++ b/bin/tests/system/rpzrecurse/ns3/named1.conf.in @@ -34,8 +34,8 @@ options { include "../dnsrps.conf"; }; -zone "policy" { type master; file "policy.db"; }; +zone "policy" { type primary; file "policy.db"; }; -zone "example.tld" { type master; file "example.db"; }; +zone "example.tld" { type primary; file "example.db"; }; -zone "." { type master; file "root.db"; }; +zone "." { type primary; file "root.db"; }; diff --git a/bin/tests/system/rpzrecurse/ns3/named2.conf.in b/bin/tests/system/rpzrecurse/ns3/named2.conf.in index 961d2d2fb2..e0140e27f5 100644 --- a/bin/tests/system/rpzrecurse/ns3/named2.conf.in +++ b/bin/tests/system/rpzrecurse/ns3/named2.conf.in @@ -33,8 +33,8 @@ options { include "../dnsrps.conf"; }; -zone "policy" { type master; file "policy.db"; }; +zone "policy" { type primary; file "policy.db"; }; -zone "example.tld" { type master; file "example.db"; }; +zone "example.tld" { type primary; file "example.db"; }; -zone "." { type master; file "root.db"; }; +zone "." { type primary; file "root.db"; }; diff --git a/bin/tests/system/rpzrecurse/ns3/named3.conf.in b/bin/tests/system/rpzrecurse/ns3/named3.conf.in index 73470fafbd..d1df4f4245 100644 --- a/bin/tests/system/rpzrecurse/ns3/named3.conf.in +++ b/bin/tests/system/rpzrecurse/ns3/named3.conf.in @@ -31,8 +31,8 @@ options { include "../dnsrps.conf"; }; -zone "policy" { type master; file "policy.db"; }; +zone "policy" { type primary; file "policy.db"; }; -zone "example.tld" { type master; file "example.db"; }; +zone "example.tld" { type primary; file "example.db"; }; -zone "." { type master; file "root.db"; }; +zone "." { type primary; file "root.db"; }; diff --git a/bin/tests/system/rpzrecurse/ns4/named.conf.in b/bin/tests/system/rpzrecurse/ns4/named.conf.in index 47b4fd55ec..c3543a79e1 100644 --- a/bin/tests/system/rpzrecurse/ns4/named.conf.in +++ b/bin/tests/system/rpzrecurse/ns4/named.conf.in @@ -33,4 +33,4 @@ controls { inet 10.53.0.4 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; }; -zone "child.example.tld" { type master; file "child.example.db"; }; +zone "child.example.tld" { type primary; file "child.example.db"; }; diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh index 3a3dfa7f7f..65b504f86d 100644 --- a/bin/tests/system/rpzrecurse/setup.sh +++ b/bin/tests/system/rpzrecurse/setup.sh @@ -72,9 +72,9 @@ PID-FILE $CWD/dnsrpzd.pid; include $CWD/dnsrpzd-license-cur.conf -zone "policy" { type master; file "`pwd`/ns3/policy.db"; }; +zone "policy" { type primary; file "`pwd`/ns3/policy.db"; }; EOF -sed -n -e 's/^ *//' -e "/zone.*.*master/s@file \"@&$CWD/ns2/@p" ns2/*.conf \ +sed -n -e 's/^ *//' -e "/zone.*.*primary/s@file \"@&$CWD/ns2/@p" ns2/*.conf \ >>dnsrpzd.conf # Run dnsrpzd to get the license and prime the static policy zones diff --git a/bin/tests/system/rpzrecurse/testgen.pl b/bin/tests/system/rpzrecurse/testgen.pl index 4637e282fd..7237ba896b 100755 --- a/bin/tests/system/rpzrecurse/testgen.pl +++ b/bin/tests/system/rpzrecurse/testgen.pl @@ -119,7 +119,7 @@ sub mkconf { print $conf_fh $policy_option; - print $conf_fh map { qq{ zone "$_->[0]" { type master; file "db.$_->[0]"; };\n} } @zones; + print $conf_fh map { qq{ zone "$_->[0]" { type primary; file "db.$_->[0]"; };\n} } @zones; print $conf_fh $boilerplate_end; } diff --git a/bin/tests/system/shutdown/ns1/named.conf.in b/bin/tests/system/shutdown/ns1/named.conf.in index b0fbe616ce..b5e97befda 100644 --- a/bin/tests/system/shutdown/ns1/named.conf.in +++ b/bin/tests/system/shutdown/ns1/named.conf.in @@ -23,7 +23,7 @@ options { # Delegate .test domain to 10.53.0.2 zone "." { - type master; + type primary; file "root.db"; allow-transfer { none; }; }; diff --git a/bin/tests/system/shutdown/ns2/named.conf.in b/bin/tests/system/shutdown/ns2/named.conf.in index 13aeb30a41..490f71347b 100644 --- a/bin/tests/system/shutdown/ns2/named.conf.in +++ b/bin/tests/system/shutdown/ns2/named.conf.in @@ -21,7 +21,7 @@ options { # 10.53.0.2 is authoritative for .test domain zone "test" { - type master; + type primary; file "test.db"; allow-transfer { none; }; }; diff --git a/bin/tests/system/staticstub/conf/bad09.conf b/bin/tests/system/staticstub/conf/bad09.conf index 349b252f22..4ee87cb1f2 100644 --- a/bin/tests/system/staticstub/conf/bad09.conf +++ b/bin/tests/system/staticstub/conf/bad09.conf @@ -23,8 +23,8 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# "masters" isn't allowed for a static-stub zone (unlike a stub zone). +# "primaries" isn't allowed for a static-stub zone (unlike a stub zone). zone "example.com" { type static-stub; - masters { 192.0.2.1; }; + primaries { 192.0.2.1; }; }; diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh index 575ea4824e..a16b4d792a 100755 --- a/bin/tests/system/staticstub/setup.sh +++ b/bin/tests/system/staticstub/setup.sh @@ -16,7 +16,7 @@ copy_setports ns2/named.conf.in tmp sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' tmp > ns2/named.conf copy_setports ns3/named.conf.in tmp -sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' tmp > ns3/named.conf +sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type primary; file "example.db.signed"; };/' tmp > ns3/named.conf copy_setports ns4/named.conf.in ns4/named.conf diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh index 369a769d7a..0e1a3be84e 100755 --- a/bin/tests/system/staticstub/tests.sh +++ b/bin/tests/system/staticstub/tests.sh @@ -113,7 +113,7 @@ done grep "2nd sub test data" dig.out.ns2.test2.$n > /dev/null || ret=1 # re-enable the parent copy_setports ns3/named.conf.in tmp -sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' tmp > ns3/named.conf +sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type primary; file "example.db.signed"; };/' tmp > ns3/named.conf rndc_reload ns3 10.53.0.3 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf index d551eaf83d..c76c622f21 100644 --- a/bin/tests/system/stress/ns1/named.conf +++ b/bin/tests/system/stress/ns1/named.conf @@ -25,6 +25,6 @@ options { }; zone "." { - type master; + type primary; file "root.db"; }; diff --git a/bin/tests/system/stress/setup.pl b/bin/tests/system/stress/setup.pl index 45c8602194..0998d05d88 100644 --- a/bin/tests/system/stress/setup.pl +++ b/bin/tests/system/stress/setup.pl @@ -47,16 +47,17 @@ for ($z = 0; $z < $n_zones; $z++) { close $rootdelegations; sub make_zones { - my ($nsno, $slaved_from) = @_; + my ($nsno, $secondaried_from) = @_; my $namedconf = new FileHandle("ns$nsno/zones.conf", "w") or die; for ($z = 0; $z < $n_zones; $z++) { my $zn = sprintf("zone%06d.example", $z); - if (defined($slaved_from)) { - print $namedconf "zone \"$zn\" { type slave; " . - "file \"$zn.bk\"; masters { $slaved_from; }; };\n"; + if (defined($secondaried_from)) { + print $namedconf "zone \"$zn\" { type secondary; " . + "file \"$zn.bk\"; primaries " . + "{ $secondaried_from; }; };\n"; } else { print $namedconf "zone \"$zn\" { " . - "type master; " . + "type primary; " . "allow-update { any; }; " . "file \"$zn.db\"; };\n"; diff --git a/bin/tests/system/stub/ns5/named.conf.in b/bin/tests/system/stub/ns5/named.conf.in index 5e5a1ac40a..07aba12b94 100644 --- a/bin/tests/system/stub/ns5/named.conf.in +++ b/bin/tests/system/stub/ns5/named.conf.in @@ -28,5 +28,5 @@ zone "." { zone "example" { type stub; file "example.db"; - masters { 10.53.0.4 port @PORT@; }; + primaries { 10.53.0.4 port @PORT@; }; }; diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh index 09a1993420..6c54c9a09d 100644 --- a/bin/tests/system/stub/tests.sh +++ b/bin/tests/system/stub/tests.sh @@ -59,7 +59,7 @@ digcomp knowngood.dig.out.rec dig.out.ns3 || ret=1 } done -echo_i "check that glue record is correctly transferred from master when minimal-responses is on" +echo_i "check that glue record is correctly transferred from primary when minimal-responses is on" ret=0 # First ensure that zone data was transfered. for i in 1 2 3 4 5 6 7; do @@ -77,7 +77,7 @@ if [ -f ns5/example.db ]; then [ $ret = 0 ] || { status=1; echo_i "failed"; } else status=1 - echo_i "failed: stub zone transfer failed ns4(master) <---> ns5/example.db" + echo_i "failed: stub zone transfer failed ns4(primary) <---> ns5/example.db" fi echo_i "exit status: $status" diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh index 2025252556..2e2e0266e9 100644 --- a/bin/tests/system/upforwd/clean.sh +++ b/bin/tests/system/upforwd/clean.sh @@ -15,7 +15,7 @@ rm -f dig.out.ns1* dig.out.ns2 dig.out.ns1 dig.out.ns3 dig.out.ns1.after rm -f ns1/*.jnl ns2/*.jnl ns3/*.jnl ns1/example.db ns2/*.bk ns3/*.bk -rm -f ns3/nomaster1.db +rm -f ns3/noprimary1.db rm -f ns3/dnstap.out* rm -f ns3/dnstap.conf rm -f dnstap.out* diff --git a/bin/tests/system/upforwd/ns3/named.conf.in b/bin/tests/system/upforwd/ns3/named.conf.in index 7bd13d3417..22879a7c3a 100644 --- a/bin/tests/system/upforwd/ns3/named.conf.in +++ b/bin/tests/system/upforwd/ns3/named.conf.in @@ -45,9 +45,9 @@ zone "example2" { primaries { 10.53.0.1; }; }; -zone "nomaster" { +zone "noprimary" { type secondary; - file "nomaster1.db"; + file "noprimary1.db"; allow-update-forwarding { any; }; masterfile-format text; primaries { 10.53.0.4; }; diff --git a/bin/tests/system/upforwd/ns3/nomaster.db b/bin/tests/system/upforwd/ns3/noprimary.db similarity index 100% rename from bin/tests/system/upforwd/ns3/nomaster.db rename to bin/tests/system/upforwd/ns3/noprimary.db diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh index 06e83b5e39..376e3c835f 100644 --- a/bin/tests/system/upforwd/setup.sh +++ b/bin/tests/system/upforwd/setup.sh @@ -12,7 +12,7 @@ . ../conf.sh cp -f ns1/example1.db ns1/example.db -cp -f ns3/nomaster.db ns3/nomaster1.db +cp -f ns3/noprimary.db ns3/noprimary1.db copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh index e46a4d2c96..2011b7f96f 100644 --- a/bin/tests/system/upforwd/tests.sh +++ b/bin/tests/system/upforwd/tests.sh @@ -194,13 +194,13 @@ do ( $NSUPDATE -- - < /dev/null 2>&1 & - $DIG -p ${PORT} +noadd +notcp +noauth nomaster. @10.53.0.3 soa > dig.out.ns3 || ret=1 + $DIG -p ${PORT} +noadd +notcp +noauth noprimary. @10.53.0.3 soa > dig.out.ns3 || ret=1 grep "status: NOERROR" dig.out.ns3 > /dev/null || ret=1 count=`expr $count + 1` done diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh index 14f1008595..50b520e091 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -154,7 +154,7 @@ while [ $i -lt 50 ]; do # Add a new zone to the configuration. cat >> ns2/zones.conf <<-EOF zone "${zone_name}" { - type master; + type primary; file "db.${zone_name}"; dnssec-dnskey-kskonly yes; auto-dnssec maintain; diff --git a/fuzz/isc_lex_gettoken.in/named.conf b/fuzz/isc_lex_gettoken.in/named.conf index f7d39fdabe..cb6c87af29 100644 --- a/fuzz/isc_lex_gettoken.in/named.conf +++ b/fuzz/isc_lex_gettoken.in/named.conf @@ -101,8 +101,8 @@ options { 5.6.7.8; }; - check - names master fail; - check - names slave warn; + check - names primary fail; + check - names secondary warn; check - names response ignore; allow - query { any; }; @@ -221,10 +221,10 @@ controls { inet 10.0.0.2 allow { none; }; }; -zone "master.demo.zone" { - type master; // what used to be called "primary" +zone "primary.demo.zone" { + type primaryr; database "somedb -option1 -option2 arg1 arg2 arg3"; - file "master.demo.zone"; + file "primary.demo.zone"; check - names fail; allow - update { none; }; allow - update - forwarding { @@ -247,12 +247,12 @@ zone "master.demo.zone" { }; }; -zone "slave.demo.zone" { - type slave; // what used to be called "secondary" - file "slave.demo.zone"; - ixfr - base "slave.demo.zone.ixfr"; // File name for IXFR transaction +zone "secondary.demo.zone" { + type secondary; + file "secondary.demo.zone"; + ixfr - base "secondary.demo.zone.ixfr"; // File name for IXFR transaction // log file - masters { + primaries { 1.2.3.4 port 10 key "foo"; // where to zone transfer from 5.6.7.8; 6.7.8.9 key "zippo"; @@ -294,8 +294,8 @@ view "test-view" in { additional - from - cache false; additional - from - auth no; match - clients { 10.0.0.1; }; - check - names master warn; - check - names slave ignore; + check - names primary warn; + check - names secondary ignore; check - names response fail; auth - nxdomain false; recursion true; @@ -321,9 +321,9 @@ view "test-view" in { min - refresh - time 111; zone "view-zone.com" { - type master; + type primary; allow - update - forwarding { 10.0.0.34; }; - file "view-zone-master"; + file "view-zone-primary"; }; server 5.6.7.8 { keys "viewkey"; }; @@ -333,12 +333,12 @@ view "test-view" in { }; zone "stub.demo.zone" { - type stub; // stub zones are like slave zones, + type stub; // stub zones are like secondary zones, // except that only the NS records // are transferred. dialup yes; file "stub.demo.zone"; - masters { + primaries { 1.2.3.4; // where to zone transfer from 5.6.7.8 port 999; }; @@ -382,7 +382,7 @@ acl can_axfr { // by can_query are OK zone "disabled-zone.com" { - type master; + type primary; file "bar"; max - retry - time 100; @@ -392,7 +392,7 @@ zone "disabled-zone.com" { }; zone "non-default-acl.demo.zone" { - type master; + type primary; file "foo"; allow - query { can_query; }; allow - transfer { can_axfr; }; diff --git a/lib/isccfg/tests/parser_test.c b/lib/isccfg/tests/parser_test.c index 79e9f50541..e96881e8dd 100644 --- a/lib/isccfg/tests/parser_test.c +++ b/lib/isccfg/tests/parser_test.c @@ -130,13 +130,13 @@ addzoneconf(void **state) { isc_buffer_t b; cfg_parser_t *p = NULL; const char *tests[] = { - "zone \"test4.baz\" { type master; file \"e.db\"; };", - "zone \"test/.baz\" { type master; file \"e.db\"; };", - "zone \"test\\\".baz\" { type master; file \"e.db\"; };", - "zone \"test\\.baz\" { type master; file \"e.db\"; };", - "zone \"test\\\\.baz\" { type master; file \"e.db\"; };", - "zone \"test\\032.baz\" { type master; file \"e.db\"; };", - "zone \"test\\010.baz\" { type master; file \"e.db\"; };" + "zone \"test4.baz\" { type primary; file \"e.db\"; };", + "zone \"test/.baz\" { type primary; file \"e.db\"; };", + "zone \"test\\\".baz\" { type primary; file \"e.db\"; };", + "zone \"test\\.baz\" { type primary; file \"e.db\"; };", + "zone \"test\\\\.baz\" { type primary; file \"e.db\"; };", + "zone \"test\\032.baz\" { type primary; file \"e.db\"; };", + "zone \"test\\010.baz\" { type primary; file \"e.db\"; };" }; char buf[1024];