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 ee6707fd57ceabcf57c0e619ab063c00c91b59c9..0e22261cd0a1a8417075f16a234ad73efeeb57b7 100644 (file)
--- 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 f60f6dd1361f2168bf3faa622c864d2e4c4e91c0..2c44788ce148c5e12ad4cb2378ae2616b394a542 100644 (file)
--- 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 '<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