From: Evan Hunt <each@isc.org>
Date: Wed, 27 Feb 2013 21:37:54 +0000 (-0800)
Subject: [master] zone-statistics no => none
X-Git-Tag: v9.10.0a1~474
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85f89d58a50a86859c04069ea87b2b23b3325d11;p=thirdparty%2Fbind9.git

[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 5fac4ad7437..1cd654e3207 100644
--- 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 e0d2420e375..94ea2633b48 100644
--- 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 5eb0ce11132..251f1383551 100644
--- 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 0b7a0f3f98b..e90305a9cdc 100644
--- 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>