3848. [bug] Adjust 'statistics-channels specified but not effective'

                        error message to account for JSON support. [RT #36008]

(cherry picked from commit a14fe8522977d391096942aae5250f00ca32d2d4)

diff --git a/CHANGES b/CHANGES
index babf25a0dac63b2c6d9b06a04b73dc80283b3f79..ae549dda80cf3940d12f61635452e13c8682a983 100644 (file)
--- 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 0764aa75b23b106348a084db9af8adaa8fc7bbf0..09e180c21d47d858e9a290c9e25f9691dd0a03dd 100644 (file)
--- 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);