ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

add "primaries" as a synonym for "masters" in named.conf

Browse Source 
as "type primary" is preferred over "type master" now, it makes
sense to make "primaries" available as a synonym too.

added a correctness check to ensure "primaries" and "masters"
cannot both be used in the same zone.

(cherry picked from commit 16e14353b1)
This commit is contained in:
Evan Hunt
2020-06-17 02:02:27 -07:00
committed by Michał Kępień
parent fa29c95992
commit 04b9cdb53c
78 changed files with 414 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/addzone/ns3/named1.conf.in
View File

@@ -30,6 +30,6 @@ zone "." {
file "redirect.db";
};
masters "testmaster" {
primaries "testmaster" {
192.5.5.241;
};

2
bin/tests/system/addzone/tests.sh
View File

@@ -687,7 +687,7 @@ status=`expr $status + $ret`
echo_i "check delzone after reconfig failure ($n)"
ret=0
$RNDCCMD 10.53.0.3 addzone 'inlineslave.example. IN { type slave; file "inlineslave.db"; masterfile-format text; masters { testmaster; }; };' > /dev/null 2>&1 || ret=1
$RNDCCMD 10.53.0.3 addzone 'inlineslave.example. IN { type slave; file "inlineslave.db"; masterfile-format text; primaries { testmaster; }; };' > /dev/null 2>&1 || ret=1
copy_setports ns3/named2.conf.in ns3/named.conf
rndc_reconfig ns3 10.53.0.3
$RNDCCMD 10.53.0.3 delzone inlineslave.example > /dev/null 2>&1 || ret=1