3862. [cleanup] Return immediately if we are not going to log the

                        message in ns_client_dumpmessage.

(cherry picked from commit 9b819daddf8f4a5bd42276ee91bf9686d42f3cee)

diff --git a/CHANGES b/CHANGES
index 743a02d3634869393ecd4ea395b64e5e921f9067..b22a63f112a532b14192ea10042623cecaed0c44 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3862.  [cleanup]       Return immediately if we are not going to log the
+                       message in ns_client_dumpmessage.
+
 3861.  [security]      Missing isc_buffer_availablelength check results
                        in a REQUIRE assertion when printing out a packet
                        (CVE-2014-3859).  [RT #36078]

diff --git a/bin/named/client.c b/bin/named/client.c
index 9c5f2ddd87062826a49d666f34d67370c65e9a56..68d14a942d91f991bbe2bf74ee8b87d9bebfdbc5 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -3198,6 +3198,9 @@ ns_client_dumpmessage(ns_client_t *client, const char *reason) {
        int len = 1024;
        isc_result_t result;
 
+       if (!isc_log_wouldlog(ns_g_lctx, ISC_LOG_DEBUG(1)))
+               return;
+
        /*
         * Note that these are multiline debug messages.  We want a newline
         * to appear in the log after each message.