mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Replace "master/slave" terminology in tests

Browse Source 
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)
This commit is contained in:
Matthijs Mekking
2021-10-05 10:41:27 +02:00
committed by Evan Hunt
parent 570554149f
commit f3d3a4ff6e
182 changed files with 580 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bin/tests/named.conf
View File

@@ -90,7 +90,7 @@ options {
// forwarding behavior, i.e. ask the forwarders first, and if that // forwarding behavior, i.e. ask the forwarders first, and if that
// doesn't work then do the full lookup. You can also say // doesn't work then do the full lookup. You can also say
// "forward only;" which is what used to be specified with // "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. // a full lookup; only the forwarders will be used.
forward first; forward first;
forwarders { forwarders {
@@ -98,8 +98,8 @@ options {
5.6.7.8; 5.6.7.8;
}; };
check-names master fail; check-names primary fail;
check-names slave warn; check-names secondary warn;
check-names response ignore; check-names response ignore;
allow-query { any; }; allow-query { any; };
@@ -209,10 +209,10 @@ controls {
inet 10.0.0.2 allow { none; }; inet 10.0.0.2 allow { none; };
}; };
zone "master.demo.zone" { zone "primary.demo.zone" {
type master; // what used to be called "primary" type primary; // what used to be called "primary"
database "somedb -option1 -option2 arg1 arg2 arg3"; database "somedb -option1 -option2 arg1 arg2 arg3";
file "master.demo.zone"; file "primary.demo.zone";
check-names fail; check-names fail;
allow-update { none; }; allow-update { none; };
allow-update-forwarding { 10.0.0.5; !any; }; 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; }; forwarders { 10.0.0.3; 1:2:3:4:5:6:7:8; };
}; };
zone "slave.demo.zone" { zone "secondary.demo.zone" {
type slave; // what used to be called "secondary" type secondary; // what used to be called "secondary"
file "slave.demo.zone"; file "secondary.demo.zone";
ixfr-base "slave.demo.zone.ixfr"; // File name for IXFR transaction log file 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 1.2.3.4 port 10 key "foo"; // where to zone transfer from
5.6.7.8; 5.6.7.8;
6.7.8.9 key "zippo"; 6.7.8.9 key "zippo";
@@ -263,8 +263,8 @@ view "test-view" in {
max-cache-size 100000; max-cache-size 100000;
allow-query { 10.0.0.30;}; allow-query { 10.0.0.30;};
match-clients { 10.0.0.1 ; }; match-clients { 10.0.0.1 ; };
check-names master warn; check-names primary warn;
check-names slave ignore; check-names secondary ignore;
check-names response fail; check-names response fail;
auth-nxdomain false; auth-nxdomain false;
recursion true; recursion true;
@@ -290,9 +290,9 @@ view "test-view" in {
min-refresh-time 111; min-refresh-time 111;
zone "view-zone.com" { zone "view-zone.com" {
type master; type primary;
allow-update-forwarding { 10.0.0.34;}; allow-update-forwarding { 10.0.0.34;};
file "view-zone-master"; file "view-zone-primary";
}; };
server 5.6.7.8 { server 5.6.7.8 {
@@ -307,12 +307,12 @@ view "test-view" in {
zone "stub.demo.zone" { 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 // except that only the NS records
// are transferred. // are transferred.
dialup yes; dialup yes;
file "stub.demo.zone"; file "stub.demo.zone";
masters { primaries {
1.2.3.4 ; // where to zone transfer from 1.2.3.4 ; // where to zone transfer from
5.6.7.8 port 999; 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 // by can_query are OK
zone "disabled-zone.com" { zone "disabled-zone.com" {
type master; type primary;
file "bar"; file "bar";
max-retry-time 100; max-retry-time 100;
@@ -358,7 +358,7 @@ zone "disabled-zone.com" {
}; };
zone "non-default-acl.demo.zone" { zone "non-default-acl.demo.zone" {
type master; type primary;
file "foo"; file "foo";
allow-query { can_query; }; allow-query { can_query; };
allow-transfer { can_axfr; }; allow-transfer { can_axfr; };

4
bin/tests/startperf/setup.sh
View File

@@ -71,10 +71,10 @@ EOF
$PERL makenames.pl $nzones | while read zonename; do $PERL makenames.pl $nzones | while read zonename; do
if [ $single_file ]; then if [ $single_file ]; then
echo "zone $zonename { type master; file \"smallzone.db\"; };" echo "zone $zonename { type primary; file \"smallzone.db\"; };"
else else
[ -d zones ] || mkdir zones [ -d zones ] || mkdir zones
$PERL mkzonefile.pl $zonename $nrecords > zones/$zonename.db $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 fi
done done

2
bin/tests/system/README
View File

@@ -187,7 +187,7 @@ structure:
e.g. 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: The meanings of the fields are as follows:

4
bin/tests/system/addzone/tests_rndc_deadlock.py
View File

@@ -35,9 +35,9 @@ def rndc_loop(test_state, domain):
''' '''
rndc_commands = [ rndc_commands = [
['addzone', domain, ['addzone', domain,
'{ type master; file "example.db"; };'], '{ type primary; file "example.db"; };'],
['modzone', domain, ['modzone', domain,
'{ type master; file "example.db"; allow-transfer { any; }; };'], '{ type primary; file "example.db"; allow-transfer { any; }; };'],
['delzone', domain], ['delzone', domain],
] ]

40
bin/tests/system/catz/tests.sh
View File

@@ -351,14 +351,14 @@ if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status+ret)) status=$((status+ret))
########################################################################## ##########################################################################
echo_i "Testing masters suboption and random labels" echo_i "Testing primaries suboption and random labels"
n=$((n+1)) 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 ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
update add somerandomlabel.zones.catalog1.example. 3600 IN PTR dom5.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -385,7 +385,7 @@ ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
update delete somerandomlabel.zones.catalog1.example. 3600 IN PTR dom5.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi 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)) 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 ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
update add masters.catalog1.example. 3600 IN A 10.53.0.3 update add primaries.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 AAAA fd92:7065:b8e:ffff::3
update add 4346f565b4d63ddb99e5d2497ff22d04e878e8f8.zones.catalog1.example. 3600 IN PTR dom6.example. update add 4346f565b4d63ddb99e5d2497ff22d04e878e8f8.zones.catalog1.example. 3600 IN PTR dom6.example.
send send
END END
@@ -441,8 +441,8 @@ echo_i "removing dom6.example. ($n)"
ret=0 ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
update delete masters.catalog1.example. 3600 IN A 10.53.0.3 update delete primaries.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 AAAA fd92:7065:b8e:ffff::3
update delete 4346f565b4d63ddb99e5d2497ff22d04e878e8f8.zones.catalog1.example. 3600 IN PTR dom6.example. update delete 4346f565b4d63ddb99e5d2497ff22d04e878e8f8.zones.catalog1.example. 3600 IN PTR dom6.example.
send send
END END
@@ -466,7 +466,7 @@ status=$((status+ret))
nextpart ns2/named.run >/dev/null nextpart ns2/named.run >/dev/null
n=$((n+1)) 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 ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} 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)) n=$((n+1))
echo_i "adding a domain dom9.example. to primary via RNDC, with transfers allowed only with TSIG key ($n)" echo_i "adding a domain dom9.example. to primary via RNDC, with transfers allowed only with TSIG key ($n)"
ret=0 ret=0
@@ -699,7 +699,7 @@ status=$((status+ret))
nextpart ns2/named.run >/dev/null nextpart ns2/named.run >/dev/null
n=$((n+1)) 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 ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
@@ -756,7 +756,7 @@ status=$((status+ret))
nextpart ns2/named.run >/dev/null nextpart ns2/named.run >/dev/null
n=$((n+1)) 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 ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
@@ -1243,7 +1243,7 @@ ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
update add 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN PTR dom13.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1273,7 +1273,7 @@ ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.3 ${PORT} server 10.53.0.3 ${PORT}
update add 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN PTR dom13.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1302,7 +1302,7 @@ ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.3 ${PORT} server 10.53.0.3 ${PORT}
update delete 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog2.example. 3600 IN PTR dom13.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1329,7 +1329,7 @@ ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.1 ${PORT} server 10.53.0.1 ${PORT}
update delete 8d7989c746b3f92b3bba2479e72afd977198363f.zones.catalog1.example. 3600 IN PTR dom13.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1424,7 +1424,7 @@ ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.3 ${PORT} server 10.53.0.3 ${PORT}
update add 45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN PTR dom14.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
@@ -1453,7 +1453,7 @@ ret=0
$NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1 $NSUPDATE -d <<END >> nsupdate.out.test$n 2>&1 || ret=1
server 10.53.0.3 ${PORT} server 10.53.0.3 ${PORT}
update delete 45e3d45ea5f7bd01c395ccbde6ae2e750a3ee8ab.zones.catalog2.example. 3600 IN PTR dom14.example. 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 send
END END
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi

2
bin/tests/system/checkconf/altdb.conf
View File

@@ -11,7 +11,7 @@
view override_bind chaos { view override_bind chaos {
zone "version.bind" chaos { zone "version.bind" chaos {
type master; type primary;
database "_builtin version"; database "_builtin version";
}; };
}; };

2
bin/tests/system/checkconf/altdlz.conf
View File

@@ -15,7 +15,7 @@ dlz external {
}; };
zone "example.com" { zone "example.com" {
type master; type primary;
dlz external; dlz external;
}; };

4
bin/tests/system/checkconf/bad-also-notify.conf
View File

@@ -10,11 +10,11 @@
*/ */
/* /*
* Missing master in also-notify clause. * Missing primary in also-notify clause.
*/ */
zone dummy { zone dummy {
type master; type primary;
file "xxxx"; file "xxxx";
also-notify { xxxx; }; also-notify { xxxx; };
}; };

8
bin/tests/system/checkconf/bad-dnssec.conf
View File

@@ -10,8 +10,8 @@
*/ */
zone not-inline { zone not-inline {
type slave; type secondary;
masters { 127.0.0.1; }; primaries { 127.0.0.1; };
inline-signing no; inline-signing no;
dnssec-dnskey-kskonly yes; dnssec-dnskey-kskonly yes;
update-check-ksk yes; update-check-ksk yes;
@@ -20,8 +20,8 @@ zone not-inline {
}; };
zone inline { zone inline {
type slave; type secondary;
masters { 127.0.0.1; }; primaries { 127.0.0.1; };
inline-signing yes; inline-signing yes;
dnssec-dnskey-kskonly yes; dnssec-dnskey-kskonly yes;
update-check-ksk yes; update-check-ksk yes;

4
bin/tests/system/checkconf/bad-in-view-dup.conf
View File

@@ -10,10 +10,10 @@
*/ */
view a { view a {
zone x { type master; file "x"; }; zone x { type primary; file "x"; };
}; };
view b { view b {
zone x { type master; file "x"; }; zone x { type primary; file "x"; };
zone x { in-view a; }; zone x { in-view a; };
}; };

6
bin/tests/system/checkconf/bad-inline-slave.conf → bin/tests/system/checkconf/bad-inline-secondary.conf
View File

@@ -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 "." { zone "." {
type slave; type secondary;
inline-signing yes; inline-signing yes;
masters { 10.53.0.1; }; primaries { 10.53.0.1; };
}; };

2
bin/tests/system/checkconf/bad-kasp-define-default.conf
View File

@@ -15,7 +15,7 @@ dnssec-policy "default" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "default"; dnssec-policy "default";
}; };

2
bin/tests/system/checkconf/bad-kasp-define-insecure.conf
View File

@@ -15,7 +15,7 @@ dnssec-policy "insecure" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "insecure"; dnssec-policy "insecure";
}; };

2
bin/tests/system/checkconf/bad-kasp-define-none.conf
View File

@@ -15,7 +15,7 @@ dnssec-policy "none" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "none"; dnssec-policy "none";
}; };

2
bin/tests/system/checkconf/bad-kasp-key1.conf
View File

@@ -16,7 +16,7 @@ dnssec-policy "badalg" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "badalg"; dnssec-policy "badalg";
}; };

2
bin/tests/system/checkconf/bad-kasp-key2.conf
View File

@@ -16,7 +16,7 @@ dnssec-policy "badalg" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "badalg"; dnssec-policy "badalg";
}; };

2
bin/tests/system/checkconf/bad-kasp-key3.conf
View File

@@ -16,7 +16,7 @@ dnssec-policy "badalg" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "badalg"; dnssec-policy "badalg";
}; };

2
bin/tests/system/checkconf/bad-kasp-key4.conf
View File

@@ -16,7 +16,7 @@ dnssec-policy "badalg" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "badalg"; dnssec-policy "badalg";
}; };

4
bin/tests/system/checkconf/bad-kasp10.conf
View File

@@ -13,13 +13,13 @@
// both using the same zone file. // both using the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "none"; dnssec-policy "none";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "insecure"; dnssec-policy "insecure";
}; };

4
bin/tests/system/checkconf/bad-kasp11.conf
View File

@@ -13,13 +13,13 @@
// with the same zone file. // with the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
allow-update { any; }; allow-update { any; };
}; };

4
bin/tests/system/checkconf/bad-kasp12.conf
View File

@@ -13,13 +13,13 @@
// with the same zone file. // with the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
update-policy { update-policy {
grant * self * TXT; grant * self * TXT;

4
bin/tests/system/checkconf/bad-kasp13.conf
View File

@@ -13,13 +13,13 @@
// with the same zone file. // with the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "insecure"; dnssec-policy "insecure";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
allow-update { any; }; allow-update { any; };
}; };

2
bin/tests/system/checkconf/bad-kasp2.conf
View File

@@ -14,7 +14,7 @@ include "good-kasp.conf";
// Bad zone configuration because this has dnssec-policy and other DNSSEC sign // Bad zone configuration because this has dnssec-policy and other DNSSEC sign
// configuration options (auto-dnssec). // configuration options (auto-dnssec).
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "test"; dnssec-policy "test";
auto-dnssec maintain; auto-dnssec maintain;

2
bin/tests/system/checkconf/bad-kasp3.conf
View File

@@ -15,7 +15,7 @@ include "good-kasp.conf";
// dnssec-policy configuration (good-kasp.conf has "test", zone refers to // dnssec-policy configuration (good-kasp.conf has "test", zone refers to
// "nosuchpolicy". // "nosuchpolicy".
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "nosuchpolicy"; dnssec-policy "nosuchpolicy";
}; };

2
bin/tests/system/checkconf/bad-kasp4.conf
View File

@@ -16,7 +16,7 @@ dnssec-policy "badduration" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "badduration"; dnssec-policy "badduration";
}; };

4
bin/tests/system/checkconf/bad-kasp6.conf
View File

@@ -12,13 +12,13 @@
// Two zones with dnssec-policy with the same zone file. // Two zones with dnssec-policy with the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "default"; dnssec-policy "default";
}; };

4
bin/tests/system/checkconf/bad-kasp7.conf
View File

@@ -13,13 +13,13 @@
// with the same zone file. // with the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "insecure"; dnssec-policy "insecure";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "insecure"; dnssec-policy "insecure";
}; };

4
bin/tests/system/checkconf/bad-kasp8.conf
View File

@@ -13,13 +13,13 @@
// both with the same zone file. // both with the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "none"; dnssec-policy "none";
}; };

4
bin/tests/system/checkconf/bad-kasp9.conf
View File

@@ -13,13 +13,13 @@
// (transitioning to inseure), both with the same zone file. // (transitioning to inseure), both with the same zone file.
zone "example1.net" { zone "example1.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "example2.net" { zone "example2.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "insecure"; dnssec-policy "insecure";
}; };

4
bin/tests/system/checkconf/bad-master-request-ixfr.conf
View File

@@ -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 { zone dummy {
type master; type primary;
request-ixfr no; request-ixfr no;
file "xxxx"; file "xxxx";
}; };

2
bin/tests/system/checkconf/bad-maxratio1.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone example { zone example {
type master; type primary;
masterfile-format raw; masterfile-format raw;
file "example.db"; file "example.db";
max-ixfr-ratio 0.9; max-ixfr-ratio 0.9;

2
bin/tests/system/checkconf/bad-maxratio2.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone example { zone example {
type master; type primary;
masterfile-format raw; masterfile-format raw;
file "example.db"; file "example.db";
max-ixfr-ratio 0%; max-ixfr-ratio 0%;

2
bin/tests/system/checkconf/bad-mirror-allow-recursion-none.conf
View File

@@ -16,5 +16,5 @@ options {
zone "." { zone "." {
type mirror; type mirror;
masters { 127.0.0.1; }; primaries { 127.0.0.1; };
}; };

2
bin/tests/system/checkconf/bad-noddns.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone example { zone example {
type master; type primary;
file "example.db"; file "example.db";
auto-dnssec maintain; auto-dnssec maintain;
allow-update { none; }; allow-update { none; };

4
bin/tests/system/checkconf/bad-options-also-notify.conf
View File

@@ -14,6 +14,6 @@ options {
}; };
zone "example.net" { zone "example.net" {
type slave; type secondary;
masters { 192.168.1.1; }; primaries { 192.168.1.1; };
}; };

0
bin/tests/system/checkconf/bad-masters-dup.conf → bin/tests/system/checkconf/bad-primaries-dup.conf
View File

130
bin/tests/system/checkconf/bad-rpz-too-many-zones.conf
View File

@@ -79,68 +79,68 @@ options {
}; };
}; };
zone "max1" { type master; file "rpz.db"; }; zone "max1" { type primary; file "rpz.db"; };
zone "max2" { type master; file "rpz.db"; }; zone "max2" { type primary; file "rpz.db"; };
zone "max3" { type master; file "rpz.db"; }; zone "max3" { type primary; file "rpz.db"; };
zone "max4" { type master; file "rpz.db"; }; zone "max4" { type primary; file "rpz.db"; };
zone "max5" { type master; file "rpz.db"; }; zone "max5" { type primary; file "rpz.db"; };
zone "max6" { type master; file "rpz.db"; }; zone "max6" { type primary; file "rpz.db"; };
zone "max7" { type master; file "rpz.db"; }; zone "max7" { type primary; file "rpz.db"; };
zone "max8" { type master; file "rpz.db"; }; zone "max8" { type primary; file "rpz.db"; };
zone "max9" { type master; file "rpz.db"; }; zone "max9" { type primary; file "rpz.db"; };
zone "max10" { type master; file "rpz.db"; }; zone "max10" { type primary; file "rpz.db"; };
zone "max11" { type master; file "rpz.db"; }; zone "max11" { type primary; file "rpz.db"; };
zone "max12" { type master; file "rpz.db"; }; zone "max12" { type primary; file "rpz.db"; };
zone "max13" { type master; file "rpz.db"; }; zone "max13" { type primary; file "rpz.db"; };
zone "max14" { type master; file "rpz.db"; }; zone "max14" { type primary; file "rpz.db"; };
zone "max15" { type master; file "rpz.db"; }; zone "max15" { type primary; file "rpz.db"; };
zone "max16" { type master; file "rpz.db"; }; zone "max16" { type primary; file "rpz.db"; };
zone "max17" { type master; file "rpz.db"; }; zone "max17" { type primary; file "rpz.db"; };
zone "max18" { type master; file "rpz.db"; }; zone "max18" { type primary; file "rpz.db"; };
zone "max19" { type master; file "rpz.db"; }; zone "max19" { type primary; file "rpz.db"; };
zone "max20" { type master; file "rpz.db"; }; zone "max20" { type primary; file "rpz.db"; };
zone "max21" { type master; file "rpz.db"; }; zone "max21" { type primary; file "rpz.db"; };
zone "max22" { type master; file "rpz.db"; }; zone "max22" { type primary; file "rpz.db"; };
zone "max23" { type master; file "rpz.db"; }; zone "max23" { type primary; file "rpz.db"; };
zone "max24" { type master; file "rpz.db"; }; zone "max24" { type primary; file "rpz.db"; };
zone "max25" { type master; file "rpz.db"; }; zone "max25" { type primary; file "rpz.db"; };
zone "max26" { type master; file "rpz.db"; }; zone "max26" { type primary; file "rpz.db"; };
zone "max27" { type master; file "rpz.db"; }; zone "max27" { type primary; file "rpz.db"; };
zone "max28" { type master; file "rpz.db"; }; zone "max28" { type primary; file "rpz.db"; };
zone "max29" { type master; file "rpz.db"; }; zone "max29" { type primary; file "rpz.db"; };
zone "max30" { type master; file "rpz.db"; }; zone "max30" { type primary; file "rpz.db"; };
zone "max31" { type master; file "rpz.db"; }; zone "max31" { type primary; file "rpz.db"; };
zone "max32" { type master; file "rpz.db"; }; zone "max32" { type primary; file "rpz.db"; };
zone "max33" { type master; file "rpz.db"; }; zone "max33" { type primary; file "rpz.db"; };
zone "max34" { type master; file "rpz.db"; }; zone "max34" { type primary; file "rpz.db"; };
zone "max35" { type master; file "rpz.db"; }; zone "max35" { type primary; file "rpz.db"; };
zone "max36" { type master; file "rpz.db"; }; zone "max36" { type primary; file "rpz.db"; };
zone "max37" { type master; file "rpz.db"; }; zone "max37" { type primary; file "rpz.db"; };
zone "max38" { type master; file "rpz.db"; }; zone "max38" { type primary; file "rpz.db"; };
zone "max39" { type master; file "rpz.db"; }; zone "max39" { type primary; file "rpz.db"; };
zone "max40" { type master; file "rpz.db"; }; zone "max40" { type primary; file "rpz.db"; };
zone "max41" { type master; file "rpz.db"; }; zone "max41" { type primary; file "rpz.db"; };
zone "max42" { type master; file "rpz.db"; }; zone "max42" { type primary; file "rpz.db"; };
zone "max43" { type master; file "rpz.db"; }; zone "max43" { type primary; file "rpz.db"; };
zone "max44" { type master; file "rpz.db"; }; zone "max44" { type primary; file "rpz.db"; };
zone "max45" { type master; file "rpz.db"; }; zone "max45" { type primary; file "rpz.db"; };
zone "max46" { type master; file "rpz.db"; }; zone "max46" { type primary; file "rpz.db"; };
zone "max47" { type master; file "rpz.db"; }; zone "max47" { type primary; file "rpz.db"; };
zone "max48" { type master; file "rpz.db"; }; zone "max48" { type primary; file "rpz.db"; };
zone "max49" { type master; file "rpz.db"; }; zone "max49" { type primary; file "rpz.db"; };
zone "max50" { type master; file "rpz.db"; }; zone "max50" { type primary; file "rpz.db"; };
zone "max51" { type master; file "rpz.db"; }; zone "max51" { type primary; file "rpz.db"; };
zone "max52" { type master; file "rpz.db"; }; zone "max52" { type primary; file "rpz.db"; };
zone "max53" { type master; file "rpz.db"; }; zone "max53" { type primary; file "rpz.db"; };
zone "max54" { type master; file "rpz.db"; }; zone "max54" { type primary; file "rpz.db"; };
zone "max55" { type master; file "rpz.db"; }; zone "max55" { type primary; file "rpz.db"; };
zone "max56" { type master; file "rpz.db"; }; zone "max56" { type primary; file "rpz.db"; };
zone "max57" { type master; file "rpz.db"; }; zone "max57" { type primary; file "rpz.db"; };
zone "max58" { type master; file "rpz.db"; }; zone "max58" { type primary; file "rpz.db"; };
zone "max59" { type master; file "rpz.db"; }; zone "max59" { type primary; file "rpz.db"; };
zone "max60" { type master; file "rpz.db"; }; zone "max60" { type primary; file "rpz.db"; };
zone "max61" { type master; file "rpz.db"; }; zone "max61" { type primary; file "rpz.db"; };
zone "max62" { type master; file "rpz.db"; }; zone "max62" { type primary; file "rpz.db"; };
zone "max63" { type master; file "rpz.db"; }; zone "max63" { type primary; file "rpz.db"; };
zone "max64" { type master; file "rpz.db"; }; zone "max64" { type primary; file "rpz.db"; };
zone "max65" { type master; file "rpz.db"; }; zone "max65" { type primary; file "rpz.db"; };

2
bin/tests/system/checkconf/bad-rpz-ttl.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com." { zone "example.com." {
type master; type primary;
file "example.com.zone"; file "example.com.zone";
}; };

2
bin/tests/system/checkconf/bad-rpz-update.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com." { zone "example.com." {
type master; type primary;
file "example.com.zone"; file "example.com.zone";
}; };

6
bin/tests/system/checkconf/bad-sharedwritable1.conf
View File

@@ -10,11 +10,11 @@
*/ */
zone a { zone a {
type master; type primary;
file "shared.db"; file "shared.db";
}; };
zone b { zone b {
type slave; type secondary;
file "shared.db"; file "shared.db";
masters { 1.2.3.4; }; primaries { 1.2.3.4; };
}; };

8
bin/tests/system/checkconf/bad-sharedwritable2.conf
View File

@@ -10,12 +10,12 @@
*/ */
zone a { zone a {
type slave; type secondary;
file "shared.db"; file "shared.db";
masters { 1.2.3.4; }; primaries { 1.2.3.4; };
}; };
zone b { zone b {
type slave; type secondary;
file "shared.db"; file "shared.db";
masters { 1.2.3.4; }; primaries { 1.2.3.4; };
}; };

4
bin/tests/system/checkconf/bad-sharedzone1.conf
View File

@@ -14,7 +14,7 @@ view "first" {
"none"; "none";
}; };
zone "clone" { zone "clone" {
type master; type primary;
file "xxx"; file "xxx";
}; };
}; };
@@ -24,6 +24,6 @@ view "second" {
}; };
zone "clone" { zone "clone" {
in-view "first"; in-view "first";
type slave; type secondary;
}; };
}; };

4
bin/tests/system/checkconf/bad-sharedzone2.conf
View File

@@ -14,7 +14,7 @@ view "first" {
"none"; "none";
}; };
zone "clone" { zone "clone" {
type master; type primary;
file "xxx"; file "xxx";
}; };
}; };
@@ -26,6 +26,6 @@ view "second" {
in-view "first"; in-view "first";
forward only; forward only;
forwarders { 10.0.0.100; }; forwarders { 10.0.0.100; };
type slave; type secondary;
}; };
}; };

2
bin/tests/system/checkconf/bad-sharedzone3.conf
View File

@@ -17,7 +17,7 @@ view first {
view second { view second {
zone shared.example { zone shared.example {
type master; type primary;
file "shared.example.db"; file "shared.example.db";
}; };
}; };

2
bin/tests/system/checkconf/bad-stub-masters-dialup.conf
View File

@@ -19,5 +19,5 @@ zone "example." {
dialup notify; dialup notify;
notify no; notify no;
file "example.bk"; file "example.bk";
// masters { 10.53.0.1; }; // primaries { 10.53.0.1; };
}; };

2
bin/tests/system/checkconf/bad-update-policy1.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * self TXT; grant * self TXT;

2
bin/tests/system/checkconf/bad-update-policy10.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * krb5-selfsub TXT; grant * krb5-selfsub TXT;

2
bin/tests/system/checkconf/bad-update-policy11.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * ms-selfsub TXT; grant * ms-selfsub TXT;

2
bin/tests/system/checkconf/bad-update-policy12.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * external TXT; grant * external TXT;

2
bin/tests/system/checkconf/bad-update-policy13.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant a-key-name name TXT; grant a-key-name name TXT;

2
bin/tests/system/checkconf/bad-update-policy14.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant a-key-name subdomain TXT; grant a-key-name subdomain TXT;

2
bin/tests/system/checkconf/bad-update-policy15.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant a-key-name wildcard TXT; grant a-key-name wildcard TXT;

2
bin/tests/system/checkconf/bad-update-policy16.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * tcp-self . "ptr(10 )"; grant * tcp-self . "ptr(10 )";

2
bin/tests/system/checkconf/bad-update-policy2.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * selfsub TXT; grant * selfsub TXT;

2
bin/tests/system/checkconf/bad-update-policy3.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * selfwild TXT; grant * selfwild TXT;

2
bin/tests/system/checkconf/bad-update-policy4.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * ms-self TXT; grant * ms-self TXT;

2
bin/tests/system/checkconf/bad-update-policy5.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * krb5-self TXT; grant * krb5-self TXT;

2
bin/tests/system/checkconf/bad-update-policy6.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * ms-subdomain TXT; grant * ms-subdomain TXT;

2
bin/tests/system/checkconf/bad-update-policy7.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * krb5-subdomain TXT; grant * krb5-subdomain TXT;

2
bin/tests/system/checkconf/bad-update-policy8.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * tcp-self TXT; grant * tcp-self TXT;

2
bin/tests/system/checkconf/bad-update-policy9.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * 6to4-self TXT; grant * 6to4-self TXT;

4
bin/tests/system/checkconf/bad-view-also-notify.conf
View File

@@ -12,7 +12,7 @@
view example { view example {
also-notify { missing; }; also-notify { missing; };
zone "example.net" { zone "example.net" {
type slave; type secondary;
masters { 192.168.1.1; }; primaries { 192.168.1.1; };
}; };
}; };

2
bin/tests/system/checkconf/check-dup-records-fail.conf
View File

@@ -14,7 +14,7 @@ options {
}; };
zone "check-dup-records" { zone "check-dup-records" {
type master; type primary;
file "check-dup-records.db"; file "check-dup-records.db";
check-dup-records fail; check-dup-records fail;
}; };

4
bin/tests/system/checkconf/check-missing-zone.conf
View File

@@ -11,14 +11,14 @@
view missing { view missing {
zone missing.example { zone missing.example {
type master; type primary;
file "missing.example.db"; file "missing.example.db";
}; };
}; };
view good { view good {
zone shared.example { zone shared.example {
type master; type primary;
file "shared.example.db"; file "shared.example.db";
}; };
}; };

2
bin/tests/system/checkconf/check-mx-cname-fail.conf
View File

@@ -14,7 +14,7 @@ options {
}; };
zone "check-mx-cname" { zone "check-mx-cname" {
type master; type primary;
file "check-mx-cname.db"; file "check-mx-cname.db";
check-mx-cname fail; check-mx-cname fail;
}; };

2
bin/tests/system/checkconf/check-mx-fail.conf
View File

@@ -14,7 +14,7 @@ options {
}; };
zone "check-mx" { zone "check-mx" {
type master; type primary;
file "check-mx.db"; file "check-mx.db";
check-mx fail; check-mx fail;
}; };

2
bin/tests/system/checkconf/check-names-fail.conf
View File

@@ -14,7 +14,7 @@ options {
}; };
zone "check-names" { zone "check-names" {
type master; type primary;
file "check-names.db"; file "check-names.db";
check-names fail; check-names fail;
}; };

2
bin/tests/system/checkconf/check-srv-cname-fail.conf
View File

@@ -14,7 +14,7 @@ options {
}; };
zone "check-srv-cname" { zone "check-srv-cname" {
type master; type primary;
file "check-srv-cname.db"; file "check-srv-cname.db";
check-srv-cname fail; check-srv-cname fail;
}; };

4
bin/tests/system/checkconf/dlz-bad.conf
View File

@@ -18,8 +18,8 @@ dlz two {
search no; search no;
}; };
zone master { zone primary {
type master; type primary;
database "none"; database "none";
dlz two; dlz two;
}; };

10
bin/tests/system/checkconf/good-kasp.conf
View File

@@ -36,26 +36,26 @@ options {
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "example1" { zone "example1" {
type master; type primary;
file "example1.db"; file "example1.db";
}; };
zone "example2" { zone "example2" {
type master; type primary;
file "example2.db"; file "example2.db";
dnssec-policy "test"; dnssec-policy "test";
}; };
zone "example3" { zone "example3" {
type master; type primary;
file "example3.db"; file "example3.db";
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "dnssec-policy-none-shared-zonefile1" { zone "dnssec-policy-none-shared-zonefile1" {
type master; type primary;
file "shared.db"; file "shared.db";
dnssec-policy "none"; dnssec-policy "none";
}; };
zone "dnssec-policy-none-shared-zonefile2" { zone "dnssec-policy-none-shared-zonefile2" {
type master; type primary;
file "shared.db"; file "shared.db";
dnssec-policy "none"; dnssec-policy "none";
}; };

2
bin/tests/system/checkconf/good-maxratio1.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone example { zone example {
type master; type primary;
masterfile-format raw; masterfile-format raw;
file "example.db"; file "example.db";
max-ixfr-ratio 50%; max-ixfr-ratio 50%;

2
bin/tests/system/checkconf/good-maxratio2.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone example { zone example {
type master; type primary;
masterfile-format raw; masterfile-format raw;
file "example.db"; file "example.db";
max-ixfr-ratio unlimited; max-ixfr-ratio unlimited;

4
bin/tests/system/checkconf/good-options-also-notify.conf
View File

@@ -14,7 +14,7 @@ options {
}; };
zone "example.net" { zone "example.net" {
type slave; type secondary;
notify no; notify no;
masters { 192.168.1.1; }; primaries { 192.168.1.1; };
}; };

2
bin/tests/system/checkconf/good-response-dot.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com." { zone "example.com." {
type master; type primary;
file "example.com.zone"; file "example.com.zone";
}; };

2
bin/tests/system/checkconf/good-rpz-ttl.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com." { zone "example.com." {
type master; type primary;
file "example.com.zone"; file "example.com.zone";
}; };

2
bin/tests/system/checkconf/good-rpz-update.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com." { zone "example.com." {
type master; type primary;
file "example.com.zone"; file "example.com.zone";
}; };

2
bin/tests/system/checkconf/good-sig-signing-type.conf
View File

@@ -1,5 +1,5 @@
zone example { zone example {
type master; type primary;
file "example.db"; file "example.db";
sig-signing-type 65280; sig-signing-type 65280;
}; };

2
bin/tests/system/checkconf/good-update-policy1.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * self * TXT; grant * self * TXT;

2
bin/tests/system/checkconf/good-update-policy10.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * krb5-subdomain . TXT; grant * krb5-subdomain . TXT;

2
bin/tests/system/checkconf/good-update-policy11.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * tcp-self . TXT; grant * tcp-self . TXT;

2
bin/tests/system/checkconf/good-update-policy12.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * 6to4-self . TXT; grant * 6to4-self . TXT;

2
bin/tests/system/checkconf/good-update-policy13.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * tcp-self . ptr(1); grant * tcp-self . ptr(1);

2
bin/tests/system/checkconf/good-update-policy2.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * self . TXT; grant * self . TXT;

2
bin/tests/system/checkconf/good-update-policy3.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * selfsub . TXT; grant * selfsub . TXT;

2
bin/tests/system/checkconf/good-update-policy4.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * selfsub * TXT; grant * selfsub * TXT;

2
bin/tests/system/checkconf/good-update-policy5.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * selfwild * TXT; grant * selfwild * TXT;

2
bin/tests/system/checkconf/good-update-policy6.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * selfwild . TXT; grant * selfwild . TXT;

2
bin/tests/system/checkconf/good-update-policy7.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * krb5-self . TXT; grant * krb5-self . TXT;

2
bin/tests/system/checkconf/good-update-policy8.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * ms-self . TXT; grant * ms-self . TXT;

2
bin/tests/system/checkconf/good-update-policy9.conf
View File

@@ -10,7 +10,7 @@
*/ */
zone "example.com" { zone "example.com" {
type master; type primary;
file "example.com.db"; file "example.com.db";
update-policy { update-policy {
grant * ms-subdomain . TXT; grant * ms-subdomain . TXT;

4
bin/tests/system/checkconf/good-view-also-notify.conf
View File

@@ -12,8 +12,8 @@
view example { view example {
also-notify { missing; }; also-notify { missing; };
zone "example.net" { zone "example.net" {
type slave; type secondary;
notify no; notify no;
masters { 192.168.1.1; }; primaries { 192.168.1.1; };
}; };
}; };

38
bin/tests/system/checkconf/good.conf
View File

@@ -95,14 +95,14 @@ view "first" {
"none"; "none";
}; };
zone "example1" { zone "example1" {
type master; type primary;
file "xxx"; file "xxx";
update-policy local; update-policy local;
max-ixfr-ratio 20%; max-ixfr-ratio 20%;
notify-source 10.10.10.10 port 53 dscp 55; notify-source 10.10.10.10 port 53 dscp 55;
}; };
zone "clone" { zone "clone" {
type master; type primary;
file "yyy"; file "yyy";
max-ixfr-ratio unlimited; max-ixfr-ratio unlimited;
}; };
@@ -114,7 +114,7 @@ view "second" {
"any"; "any";
}; };
zone "example1" { zone "example1" {
type master; type primary;
file "zzz"; file "zzz";
update-policy local; update-policy local;
zone-statistics yes; zone-statistics yes;
@@ -138,7 +138,7 @@ view "second" {
}; };
zone "." { zone "." {
type redirect; type redirect;
masters { primaries {
1.2.3.4; 1.2.3.4;
}; };
}; };
@@ -157,7 +157,7 @@ view "third" {
}; };
}; };
zone "dnssec" { zone "dnssec" {
type master; type primary;
file "file"; file "file";
allow-update { allow-update {
"any"; "any";
@@ -170,7 +170,7 @@ view "third" {
}; };
zone "s" { zone "s" {
type secondary; type secondary;
masters { primaries {
1.2.3.4; 1.2.3.4;
}; };
notify primary-only; notify primary-only;
@@ -178,7 +178,7 @@ view "third" {
}; };
view "fourth" { view "fourth" {
zone "dnssec-test" { zone "dnssec-test" {
type master; type primary;
file "dnssec-test.db"; file "dnssec-test.db";
parental-agents { parental-agents {
1.2.3.4; 1.2.3.4;
@@ -188,7 +188,7 @@ view "fourth" {
parental-source 10.10.10.10 port 53 dscp 55; parental-source 10.10.10.10 port 53 dscp 55;
}; };
zone "dnssec-default" { zone "dnssec-default" {
type master; type primary;
file "dnssec-default.db"; file "dnssec-default.db";
parental-agents { parental-agents {
"parents"; "parents";
@@ -196,31 +196,31 @@ view "fourth" {
dnssec-policy "default"; dnssec-policy "default";
}; };
zone "dnssec-inherit" { zone "dnssec-inherit" {
type master; type primary;
file "dnssec-inherit.db"; file "dnssec-inherit.db";
}; };
zone "dnssec-none" { zone "dnssec-none" {
type master; type primary;
file "dnssec-none.db"; file "dnssec-none.db";
dnssec-policy "none"; dnssec-policy "none";
}; };
zone "dnssec-view1" { zone "dnssec-view1" {
type master; type primary;
file "dnssec-view41.db"; file "dnssec-view41.db";
dnssec-policy "test"; dnssec-policy "test";
}; };
zone "dnssec-view2" { zone "dnssec-view2" {
type master; type primary;
file "dnssec-view42.db"; file "dnssec-view42.db";
}; };
zone "dnssec-view3" { zone "dnssec-view3" {
type master; type primary;
file "dnssec-view43.db"; file "dnssec-view43.db";
dnssec-policy "none"; dnssec-policy "none";
key-directory "keys"; key-directory "keys";
}; };
zone "dnssec-view4" { zone "dnssec-view4" {
type master; type primary;
file "dnssec-view44.db"; file "dnssec-view44.db";
dnssec-policy "none"; dnssec-policy "none";
}; };
@@ -229,24 +229,24 @@ view "fourth" {
}; };
view "fifth" { view "fifth" {
zone "dnssec-view1" { zone "dnssec-view1" {
type master; type primary;
file "dnssec-view51.db"; file "dnssec-view51.db";
dnssec-policy "test"; dnssec-policy "test";
}; };
zone "dnssec-view2" { zone "dnssec-view2" {
type master; type primary;
file "dnssec-view52.db"; file "dnssec-view52.db";
dnssec-policy "test"; dnssec-policy "test";
key-directory "keys"; key-directory "keys";
}; };
zone "dnssec-view3" { zone "dnssec-view3" {
type master; type primary;
file "dnssec-view53.db"; file "dnssec-view53.db";
dnssec-policy "default"; dnssec-policy "default";
key-directory "keys"; key-directory "keys";
}; };
zone "dnssec-view4" { zone "dnssec-view4" {
type master; type primary;
file "dnssec-view54.db"; file "dnssec-view54.db";
dnssec-policy "none"; dnssec-policy "none";
}; };
@@ -254,7 +254,7 @@ view "fifth" {
}; };
view "chaos" chaos { view "chaos" chaos {
zone "hostname.bind" chaos { zone "hostname.bind" chaos {
type master; type primary;
database "_builtin hostname"; database "_builtin hostname";
}; };
}; };

34
bin/tests/system/checkconf/good.zonelist
View File

@@ -1,24 +1,24 @@
example1 IN first master example1 IN first primary
clone IN first master clone IN first primary
example1 IN second master example1 IN second primary
example2 IN second static-stub example2 IN second static-stub
example3 IN second static-stub example3 IN second static-stub
clone IN second in-view first clone IN second in-view first
. IN second redirect . IN second redirect
clone IN third in-view first clone IN third in-view first
dnssec IN third master dnssec IN third primary
p IN third primary p IN third primary
s IN third secondary s IN third secondary
dnssec-test IN fourth master dnssec-test IN fourth primary
dnssec-default IN fourth master dnssec-default IN fourth primary
dnssec-inherit IN fourth master dnssec-inherit IN fourth primary
dnssec-none IN fourth master dnssec-none IN fourth primary
dnssec-view1 IN fourth master dnssec-view1 IN fourth primary
dnssec-view2 IN fourth master dnssec-view2 IN fourth primary
dnssec-view3 IN fourth master dnssec-view3 IN fourth primary
dnssec-view4 IN fourth master dnssec-view4 IN fourth primary
dnssec-view1 IN fifth master dnssec-view1 IN fifth primary
dnssec-view2 IN fifth master dnssec-view2 IN fifth primary
dnssec-view3 IN fifth master dnssec-view3 IN fifth primary
dnssec-view4 IN fifth master dnssec-view4 IN fifth primary
hostname.bind chaos chaos master hostname.bind chaos chaos primary

2
bin/tests/system/checkconf/in-view-good.conf
View File

@@ -11,7 +11,7 @@
view internal { view internal {
zone shared.example { zone shared.example {
type master; type primary;
file "shared.example.db"; file "shared.example.db";
}; };
}; };

10
bin/tests/system/checkconf/inline-bad.conf
View File

@@ -10,16 +10,16 @@
*/ */
acl "transferees" {}; acl "transferees" {};
masters "stealthMasters" {127.0.0.1;}; primaries "stealthPrimaries" {127.0.0.1;};
masters "publicSlaves" {127.0.0.1;}; primaries "publicSecondaries" {127.0.0.1;};
zone "example.net" { zone "example.net" {
type slave; type secondary;
key-directory "/var/lib/bind/example.net"; key-directory "/var/lib/bind/example.net";
auto-dnssec maintain; auto-dnssec maintain;
inline-signing yes; inline-signing yes;
masters { stealthMasters; }; primaries { stealthPrimaries; };
notify explicit; notify explicit;
also-notify { publicSlaves; }; also-notify { publicSecondaries; };
allow-transfer { localhost; transferees; }; allow-transfer { localhost; transferees; };
}; };

10
bin/tests/system/checkconf/inline-good.conf
View File

@@ -10,17 +10,17 @@
*/ */
acl "transferees" {}; acl "transferees" {};
masters "stealthMasters" {127.0.0.1;}; primaries "stealthPrimaries" {127.0.0.1;};
masters "publicSlaves" {127.0.0.1;}; primaries "publicSecondaries" {127.0.0.1;};
zone "example.net" { zone "example.net" {
type slave; type secondary;
file "/var/cache/bind/example.net.db"; file "/var/cache/bind/example.net.db";
key-directory "/var/lib/bind/example.net"; key-directory "/var/lib/bind/example.net";
auto-dnssec maintain; auto-dnssec maintain;
inline-signing yes; inline-signing yes;
masters { stealthMasters; }; primaries { stealthPrimaries; };
notify explicit; notify explicit;
also-notify { publicSlaves; }; also-notify { publicSecondaries; };
allow-transfer { localhost; transferees; }; allow-transfer { localhost; transferees; };
}; };

10
bin/tests/system/checkconf/inline-no.conf
View File

@@ -10,16 +10,16 @@
*/ */
acl "transferees" {}; acl "transferees" {};
masters "stealthMasters" {127.0.0.1;}; primaries "stealthPrimaries" {127.0.0.1;};
masters "publicSlaves" {127.0.0.1;}; primaries "publicSecondaries" {127.0.0.1;};
zone "example.net" { zone "example.net" {
type slave; type secondary;
key-directory "/var/lib/bind/example.net"; key-directory "/var/lib/bind/example.net";
auto-dnssec maintain; auto-dnssec maintain;
inline-signing no; inline-signing no;
masters { stealthMasters; }; primaries { stealthPrimaries; };
notify explicit; notify explicit;
also-notify { publicSlaves; }; also-notify { publicSecondaries; };
allow-transfer { localhost; transferees; }; allow-transfer { localhost; transferees; };
}; };

2
bin/tests/system/checkconf/kasp-and-other-dnssec-options.conf
View File

@@ -12,7 +12,7 @@
include "good-kasp.conf"; include "good-kasp.conf";
zone "nsec3.net" { zone "nsec3.net" {
type master; type primary;
file "nsec3.db"; file "nsec3.db";
dnssec-policy "test"; dnssec-policy "test";
auto-dnssec maintain; auto-dnssec maintain;

2
bin/tests/system/checkconf/kasp-bad-keylen.conf
View File

@@ -16,7 +16,7 @@ dnssec-policy "bad-keylen" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "badkeylen"; dnssec-policy "badkeylen";
}; };

2
bin/tests/system/checkconf/kasp-bad-nsec3-alg.conf
View File

@@ -17,7 +17,7 @@ dnssec-policy "bad-salt" {
}; };
zone "example.net" { zone "example.net" {
type master; type primary;
file "example.db"; file "example.db";
dnssec-policy "bad-salt"; dnssec-policy "bad-salt";
}; };

Some files were not shown because too many files have changed in this diff Show More