From: Mark Andrews <marka@isc.org>
Date: Thu, 15 May 2014 01:12:05 +0000 (+1000)
Subject: 3848.   [bug]           Adjust 'statistics-channels specified but not effective'
X-Git-Tag: v9.11.0a1~1640
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a14fe8522977d391096942aae5250f00ca32d2d4;p=thirdparty%2Fbind9.git

3848.   [bug]           Adjust 'statistics-channels specified but not effective'
                        error message to account for JSON support. [RT #36008]
---

diff --git a/CHANGES b/CHANGES
index 284f9d9a97e..c4d151062c5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3848.	[bug]		Adjust 'statistics-channels specified but not effective'
+			error message to account for JSON support. [RT #36008]
+
 3847.	[bug]		'configure --with-dlz-postgres' failed to fail when
 			there is not support available.
 
diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 0764aa75b23..09e180c21d4 100644
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -2353,11 +2353,11 @@ ns_statschannels_configure(ns_server_t *server, const cfg_obj_t *config,
 	 * address-in-use error.
 	 */
 	if (statschannellist != NULL) {
-#ifndef HAVE_LIBXML2
+#if !defined(HAVE_LIBXML2) && !defined(HAVE_JSON)
 		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
 			      NS_LOGMODULE_SERVER, ISC_LOG_WARNING,
 			      "statistics-channels specified but not effective "
-			      "due to missing XML library");
+			      "due to missing XML and/or JSON library");
 #endif
 
 		for (element = cfg_list_first(statschannellist);