[master] zone-statistics no => none

3502.	[func]		zone-statistics: "no" is now a synonym for "none",
			instead of "terse". [RT #29165]

diff --git a/CHANGES b/CHANGES
index 5fac4ad7437bd169d19c29f73d505d69b944f1e5..1cd654e32073b30ce961def1b3d1bd69689057c5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3502.  [func]          zone-statistics: "no" is now a synonym for "none",
+                       instead of "terse". [RT #29165]
+
 3501.  [func]          zone-statistics now takes three options: full,
                        terse, and none. "yes" and "no" are retained as
                        synonyms for full and terse, respectively. [RT #29165]

diff --git a/bin/named/server.c b/bin/named/server.c
index e0d2420e3759b9e877c82fc6339df90d7ab8d97c..94ea2633b481ce3f5f82442cc667399dea046ddf 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -3327,7 +3327,7 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
                        if (cfg_obj_asboolean(obj))
                                statlevel = dns_zonestat_full;
                        else
-                               statlevel = dns_zonestat_terse; /* XXX */
+                               statlevel = dns_zonestat_none;
                } else {
                        const char *levelstr = cfg_obj_asstring(obj);
                        if (strcasecmp(levelstr, "full") == 0)

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 5eb0ce1113279b94ed3edf12fd6416d009dfe21f..251f1383551bc53312da0c3d37cd7a05b1439186 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1038,7 +1038,7 @@ ns_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
                if (cfg_obj_asboolean(obj))
                        statlevel = dns_zonestat_full;
                else
-                       statlevel = dns_zonestat_terse; /* XXX */
+                       statlevel = dns_zonestat_none;
        } else {
                const char *levelstr = cfg_obj_asstring(obj);
                if (strcasecmp(levelstr, "full") == 0)

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 0b7a0f3f98b1ab0c89a6bbb916514259dbdaa009..e90305a9cdc5d4438af992727a95cfeae9ee5b7e 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6167,9 +6167,12 @@ options {
                 For backward compatibility with earlier versions
                 of BIND 9, the <command>zone-statistics</command>
                 option can also accept <userinput>yes</userinput>
-                or <userinput>no</userinput>, which have the same
-                effect as <userinput>full</userinput> and
-                <userinput>terse</userinput>, respectively.
+                or <userinput>no</userinput>; <userinput>yes</userinput>
+                has the same meaning as <userinput>full</userinput>.
+                As of <acronym>BIND</acronym> 9.10, 
+                <userinput>no</userinput> has the same meaning
+                as <userinput>none</userinput>; previously, it
+                was the same as <userinput>terse</userinput>.
               </para>
             </listitem>
           </varlistentry>