From cd1bb82d34217710922f3b0f5cb310896e1493f1 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Wed, 25 Aug 2021 22:33:52 -0700 Subject: [PATCH] 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. --- bin/named/statschannel.c | 4 ++-- bin/tests/system/statistics/tests.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index ee6707fd57..0e22261cd0 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 f60f6dd136..2c44788ce1 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