From: Evan Hunt Date: Thu, 26 Aug 2021 05:33:52 +0000 (-0700) Subject: use "primary" and "secondary" in statschannel output X-Git-Tag: v9.17.18~10^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd1bb82d34217710922f3b0f5cb310896e1493f1;p=thirdparty%2Fbind9.git use "primary" and "secondary" in statschannel output zone statistics were still using the old terminology. NOTE: this change may affect scripts that parse statistics output. --- diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index ee6707fd57c..0e22261cd0a 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -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" }, diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh index f60f6dd1361..2c44788ce14 100644 --- a/bin/tests/system/statistics/tests.sh +++ b/bin/tests/system/statistics/tests.sh @@ -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 'master' curl.out.${n} > /dev/null || ret=1 + grep 'primary' curl.out.${n} > /dev/null || ret=1 else echo_i "skipping test as libxml2 and/or curl was not found" fi