// 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 {
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; };
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; };
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";
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;
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 {
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;
};
// by can_query are OK
zone "disabled-zone.com" {
- type master;
+ type primary;
file "bar";
max-retry-time 100;
};
zone "non-default-acl.demo.zone" {
- type master;
+ type primary;
file "foo";
allow-query { can_query; };
allow-transfer { can_axfr; };
$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
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:
'''
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],
]
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 <<END >> 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
$NSUPDATE -d <<END >> 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
##########################################################################
-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 <<END >> 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
ret=0
$NSUPDATE -d <<END >> 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
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 <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT}
##########################################################################
-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
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 <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT}
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 <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT}
$NSUPDATE -d <<END >> 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
$NSUPDATE -d <<END >> 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
$NSUPDATE -d <<END >> 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
$NSUPDATE -d <<END >> 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
$NSUPDATE -d <<END >> 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
$NSUPDATE -d <<END >> 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
view override_bind chaos {
zone "version.bind" chaos {
- type master;
+ type primary;
database "_builtin version";
};
};
};
zone "example.com" {
- type master;
+ type primary;
dlz external;
};
*/
/*
- * Missing master in also-notify clause.
+ * Missing primary in also-notify clause.
*/
zone dummy {
- type master;
+ type primary;
file "xxxx";
also-notify { xxxx; };
};
*/
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;
};
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;
*/
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; };
};
*/
/*
- * 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; };
+ };
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "default";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "insecure";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "none";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "badalg";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "badalg";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "badalg";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "badalg";
};
// 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";
};
// 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; };
};
// 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;
// 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; };
};
// 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;
// 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";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "badduration";
};
// 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";
};
// 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";
};
// 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";
};
// (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";
};
*/
/*
- * 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";
};
*/
zone example {
- type master;
+ type primary;
masterfile-format raw;
file "example.db";
max-ixfr-ratio 0.9;
*/
zone example {
- type master;
+ type primary;
masterfile-format raw;
file "example.db";
max-ixfr-ratio 0%;
zone "." {
type mirror;
- masters { 127.0.0.1; };
+ primaries { 127.0.0.1; };
};
*/
zone example {
- type master;
+ type primary;
file "example.db";
auto-dnssec maintain;
allow-update { none; };
};
zone "example.net" {
- type slave;
- masters { 192.168.1.1; };
+ type secondary;
+ primaries { 192.168.1.1; };
};
};
};
-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"; };
*/
zone "example.com." {
- type master;
+ type primary;
file "example.com.zone";
};
*/
zone "example.com." {
- type master;
+ type primary;
file "example.com.zone";
};
*/
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; };
};
*/
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; };
};
"none";
};
zone "clone" {
- type master;
+ type primary;
file "xxx";
};
};
};
zone "clone" {
in-view "first";
- type slave;
+ type secondary;
};
};
"none";
};
zone "clone" {
- type master;
+ type primary;
file "xxx";
};
};
in-view "first";
forward only;
forwarders { 10.0.0.100; };
- type slave;
+ type secondary;
};
};
view second {
zone shared.example {
- type master;
+ type primary;
file "shared.example.db";
};
};
dialup notify;
notify no;
file "example.bk";
- // masters { 10.53.0.1; };
+ // primaries { 10.53.0.1; };
};
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * self TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * krb5-selfsub TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * ms-selfsub TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * external TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant a-key-name name TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant a-key-name subdomain TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant a-key-name wildcard TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * tcp-self . "ptr(10 )";
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * selfsub TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * selfwild TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * ms-self TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * krb5-self TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * ms-subdomain TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * krb5-subdomain TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * tcp-self TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * 6to4-self TXT;
view example {
also-notify { missing; };
zone "example.net" {
- type slave;
- masters { 192.168.1.1; };
+ type secondary;
+ primaries { 192.168.1.1; };
};
};
};
zone "check-dup-records" {
- type master;
+ type primary;
file "check-dup-records.db";
check-dup-records fail;
};
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";
};
};
};
zone "check-mx-cname" {
- type master;
+ type primary;
file "check-mx-cname.db";
check-mx-cname fail;
};
};
zone "check-mx" {
- type master;
+ type primary;
file "check-mx.db";
check-mx fail;
};
};
zone "check-names" {
- type master;
+ type primary;
file "check-names.db";
check-names fail;
};
};
zone "check-srv-cname" {
- type master;
+ type primary;
file "check-srv-cname.db";
check-srv-cname fail;
};
search no;
};
-zone master {
- type master;
+zone primary {
+ type primary;
database "none";
dlz two;
};
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";
};
*/
zone example {
- type master;
+ type primary;
masterfile-format raw;
file "example.db";
max-ixfr-ratio 50%;
*/
zone example {
- type master;
+ type primary;
masterfile-format raw;
file "example.db";
max-ixfr-ratio unlimited;
};
zone "example.net" {
- type slave;
+ type secondary;
notify no;
- masters { 192.168.1.1; };
+ primaries { 192.168.1.1; };
};
*/
zone "example.com." {
- type master;
+ type primary;
file "example.com.zone";
};
*/
zone "example.com." {
- type master;
+ type primary;
file "example.com.zone";
};
*/
zone "example.com." {
- type master;
+ type primary;
file "example.com.zone";
};
zone example {
- type master;
+ type primary;
file "example.db";
sig-signing-type 65280;
};
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * self * TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * krb5-subdomain . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * tcp-self . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * 6to4-self . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * tcp-self . ptr(1);
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * self . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * selfsub . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * selfsub * TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * selfwild * TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * selfwild . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * krb5-self . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * ms-self . TXT;
*/
zone "example.com" {
- type master;
+ type primary;
file "example.com.db";
update-policy {
grant * ms-subdomain . TXT;
view example {
also-notify { missing; };
zone "example.net" {
- type slave;
+ type secondary;
notify no;
- masters { 192.168.1.1; };
+ primaries { 192.168.1.1; };
};
};
"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;
};
"any";
};
zone "example1" {
- type master;
+ type primary;
file "zzz";
update-policy local;
zone-statistics yes;
};
zone "." {
type redirect;
- masters {
+ primaries {
1.2.3.4;
};
};
};
};
zone "dnssec" {
- type master;
+ type primary;
file "file";
allow-update {
"any";
};
zone "s" {
type secondary;
- masters {
+ primaries {
1.2.3.4;
};
notify primary-only;
};
view "fourth" {
zone "dnssec-test" {
- type master;
+ type primary;
file "dnssec-test.db";
parental-agents {
1.2.3.4;
parental-source 10.10.10.10 port 53 dscp 55;
};
zone "dnssec-default" {
- type master;
+ type primary;
file "dnssec-default.db";
parental-agents {
"parents";
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";
};
};
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";
};
};
view "chaos" chaos {
zone "hostname.bind" chaos {
- type master;
+ type primary;
database "_builtin hostname";
};
};
-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
view internal {
zone shared.example {
- type master;
+ type primary;
file "shared.example.db";
};
};
*/
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; };
};
*/
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; };
};
*/
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; };
};
include "good-kasp.conf";
zone "nsec3.net" {
- type master;
+ type primary;
file "nsec3.db";
dnssec-policy "test";
auto-dnssec maintain;
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "badkeylen";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "bad-salt";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "default";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "bad-salt";
};
};
zone "example.net" {
- type master;
+ type primary;
file "example.db";
dnssec-policy "warn-length";
};
};
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;
};
};
zone "maxttl.example" {
- type master;
+ type primary;
file "maxttl-bad.db";
};
*/
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; };
};
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; };
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; };
};
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;
};
};
zone "example" {
- type master;
+ type primary;
file "example.db";
};
};
zone dummy {
- type master;
+ type primary;
file "xxxx";
key-directory "test.keydir";
};
*/
zone example {
- type master;
+ type primary;
masterfile-format raw;
file "example.db";
max-ixfr-ratio 101%;
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.
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;;
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 <<EOF >>$MCONF
-$MASTER };
+$PRIMARY };
EOF
# write dnsrps settings for resolvers that should not start dnsrpzd
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' \
};
zone "normal.example" {
- type master;
+ type primary;
file "normal.db";
};
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
};
zone "." {
- type master;
+ type primary;
file "root.db";
};
zone "example." {
- type master;
+ type primary;
notify explicit;
also-notify { 10.53.0.2; };
dialup yes;
};
zone "example." {
- type slave;
+ type secondary;
dialup passive;
notify no;
file "example.bk";
- masters { 10.53.0.1; };
+ primaries { 10.53.0.1; };
};
};
zone "example." {
- type slave;
+ type secondary;
dialup refresh;
notify no;
file "example.bk";
- masters { 10.53.0.2; };
+ primaries { 10.53.0.2; };
};
};
zone "ipv4only.arpa" {
- type master;
+ type primary;
file "ipv4only.arpa.db";
};
};
zone "ipv4only.arpa" {
- type master;
+ type primary;
file "ipv4only.arpa.db";
};
};
zone "ipv4only.arpa" {
- type master;
+ type primary;
file "ipv4only.arpa.db";
};
};
zone "hours-vs-days" {
- type master;
+ type primary;
file "hours-vs-days.db.signed";
auto-dnssec maintain;
/* validity 500 days, resign in 499 days */
};
zone "too-many-iterations" {
- type master;
+ type primary;
file "too-many-iterations.db.signed";
};
#
# 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 <<EOF
\$TTL 3600
-@ 86400 IN SOA ns${master} hostmaster (
+@ 86400 IN SOA ns${primary} hostmaster (
1397051952 ; "SER0"
5
5
noixfr. NS ns3.noixfr.
ns3.noixfr. A 10.53.0.3
-master. NS ns3.master.
-ns3.master. A 10.53.0.3
+primary. NS ns3.primary.
+ns3.primary. A 10.53.0.3
dynamic. NS ns3.dynamic.
ns3.dynamic. A 10.53.0.3
file "noixfr.bk";
};
-zone "master" {
+zone "primary" {
type primary;
inline-signing yes;
auto-dnssec maintain;
- file "master.db";
+ file "primary.db";
notify explicit;
also-notify {
10.53.0.3;
keyname=`$KEYGEN -q -a RSASHA1 -b 1024 -n zone -f KSK $zone`
$DSFROMKEY -T 1200 $keyname >> ../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`
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
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
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
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
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
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
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
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`
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
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
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
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)"
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
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
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`
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
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`
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
}
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`
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`
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";
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";
/* 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";
};
/* 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";
};
match-clients { key "external"; };
zone "view-rsasha256.kasp" {
- type master;
+ type primary;
file "view-rsasha256.kasp.ext.db";
auto-dnssec maintain;
inline-signing yes;
match-clients { key "internal"; };
zone "view-rsasha256.kasp" {
- type master;
+ type primary;
file "view-rsasha256.kasp.int.db";
auto-dnssec maintain;
inline-signing yes;
match-clients { key "external"; };
zone "view-rsasha256.kasp" {
- type master;
+ type primary;
file "view-rsasha256.kasp.ext.db";
dnssec-policy "rsasha256";
};
match-clients { key "internal"; };
zone "view-rsasha256.kasp" {
- type master;
+ type primary;
file "view-rsasha256.kasp.int.db";
dnssec-policy "rsasha256";
};
[ $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
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
};
zone "denyname.example" {
- type master;
+ type primary;
file "denyname.example.db";
update-policy {
deny subkey name denyname.example;
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
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))
*/
zone "." {
- type master;
- file "master.db";
+ type primary;
+ file "primary.db";
};
zone "." {
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;
};
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; }; };
# turn rpz on or off
include "rpz-switch";
- include "../dnsrps-slave.conf";
+ include "../dnsrps-secondary.conf";
};
key rndc_key {
nsip-enable yes
nsdname-enable yes;
- include "../dnsrps-slave.conf";
+ include "../dnsrps-secondary.conf";
};
logging { category rpz { default_debug; }; };
nsdname-enable yes
min-update-interval 0;
- include "../dnsrps-slave.conf";
+ include "../dnsrps-secondary.conf";
};
logging { category rpz { default_debug; }; };
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=
/ns4/named.conf
/ans5/ans.pl
/ans5/ans.pid
-/dnsrps-slave.conf
+/dnsrps-secondary.conf
/dnsrps.conf
/dnsrpzd.conf
session.key
};
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";
};
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;
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;
querylog yes;
# let ns3 start dnsrpzd
- include "../dnsrps-slave.conf";
+ include "../dnsrps-secondary.conf";
};
key rndc_key {
};
# policy zones to be tested
- zone "invalidprefixlength" { type master; file "db.invalidprefixlength"; };
+ zone "invalidprefixlength" { type primary; file "db.invalidprefixlength"; };
};
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;
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;
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;
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;
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;
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;
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"; };
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"; };
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"; };
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"; };
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
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;
}
# Delegate .test domain to 10.53.0.2
zone "." {
- type master;
+ type primary;
file "root.db";
allow-transfer { none; };
};
# 10.53.0.2 is authoritative for .test domain
zone "test" {
- type master;
+ type primary;
file "test.db";
allow-transfer { none; };
};
# 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; };
};
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
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`
};
zone "." {
- type master;
+ type primary;
file "root.db";
};
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";
zone "example" {
type stub;
file "example.db";
- masters { 10.53.0.4 port @PORT@; };
+ primaries { 10.53.0.4 port @PORT@; };
};
}
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
[ $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"
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*
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; };
. ../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
(
$NSUPDATE -- - <<EOF
server 10.53.0.3 ${PORT}
-zone nomaster
-update add unsigned.nomaster. 600 A 10.10.10.1
-update add unsigned.nomaster. 600 TXT Foo
+zone noprimary
+update add unsigned.noprimary. 600 A 10.10.10.1
+update add unsigned.noprimary. 600 TXT Foo
send
EOF
) > /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
# 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;
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; };
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 {
};
};
-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";
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;
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"; };
};
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;
};
// by can_query are OK
zone "disabled-zone.com" {
- type master;
+ type primary;
file "bar";
max - retry - time 100;
};
zone "non-default-acl.demo.zone" {
- type master;
+ type primary;
file "foo";
allow - query { can_query; };
allow - transfer { can_axfr; };
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];
projects / thirdparty / bind9.git / commitdiff
