3623. [bug] zone-statistics was only effective in new statistics.

                        [RT #34466]

diff --git a/CHANGES b/CHANGES
index d5ffe63e02b212f77d109f3d347ee77d50ef316d..148dd319a358c7fbd81526f742f2696d2296abac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3623.  [bug]           zone-statistics was only effective in new statistics.
+                       [RT #34466]
+
        --- 9.9.4rc1 released ---
 
 3621.  [security]      Incorrect bounds checking on private type 'keydata'

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index b1372e30a67cbf41bd5c8f9f934a52d8cbe9e9bc..daebca4e9d84aa101b8e64a0d12ce8888269563f 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -982,6 +982,10 @@ zone_xmlrender(dns_zone_t *zone, void *arg) {
        int xmlrc;
        isc_result_t result;
 
+       statlevel = dns_zone_getstatlevel(zone);
+       if (statlevel == dns_zonestat_none)
+               return (ISC_R_SUCCESS);
+
        TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "zone"));
 
        dns_zone_name(zone, buf, sizeof(buf));