From 9b819daddf8f4a5bd42276ee91bf9686d42f3cee Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 27 May 2014 12:16:04 +1000 Subject: [PATCH] 3862. [cleanup] Return immediately if we are not going to log the message in ns_client_dumpmessage. --- CHANGES | 3 +++ bin/named/client.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index 340c7824ec..54156f48fb 100644 --- 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 9c5f2ddd87..68d14a942d 100644 --- 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.