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

use "primary" and "secondary" in statschannel output

Browse Source 
zone statistics were still using the old terminology. NOTE: this
change may affect scripts that parse statistics output.
This commit is contained in:
Evan Hunt
2021-08-25 22:33:52 -07:00
parent 679f1c0dad
commit cd1bb82d34
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/named/statschannel.c
View File

@@ -104,8 +104,8 @@ user_zonetype(dns_zone_t *zone) {
const dns_zonetype_t type;
const char *const string;
} typemap[] = { { dns_zone_none, "none" },
{ dns_zone_primary, "master" },
{ dns_zone_secondary, "slave" },
{ dns_zone_primary, "primary" },
{ dns_zone_secondary, "secondary" },
{ dns_zone_mirror, "mirror" },
{ dns_zone_stub, "stub" },
{ dns_zone_staticstub, "static-stub" },

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

@@ -152,7 +152,7 @@ ret=0
echo_i "checking that zones return their type ($n)"
if $FEATURETEST --have-libxml2 && [ -x ${CURL} ] ; then
${CURL} http://10.53.0.1:${EXTRAPORT1}/xml/v3/zones > curl.out.${n} 2>/dev/null || ret=1
grep '<zone name="32/1.0.0.127-in-addr.example" rdataclass="IN"><type>master</type>' curl.out.${n} > /dev/null || ret=1
grep '<zone name="32/1.0.0.127-in-addr.example" rdataclass="IN"><type>primary</type>' curl.out.${n} > /dev/null || ret=1
else
echo_i "skipping test as libxml2 and/or curl was not found"
fi