From: Evan Hunt <each@isc.org>
Date: Wed, 30 Apr 2014 00:04:21 +0000 (-0700)
Subject: [master] log query errors at info when query logging is on
X-Git-Tag: v9.11.0a1~1695
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0dc0b029e9aecc6e2139109091ea68cc6aff7081;p=thirdparty%2Fbind9.git

[master] log query errors at info when query logging is on

3830.	[func]		When query logging is enabled, log query errors at
			the same level ('info') as the queries themselves.
			[RT #35844]
---

diff --git a/CHANGES b/CHANGES
index cc4f9972b41..fc2d1f50188 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3830.	[func]		When query logging is enabled, log query errors at
+			the same level ('info') as the queries themselves.
+			[RT #35844]
+
 3829.	[func]		"dig +ttlunits" causes dig to print TTL values
 			with time-unit suffixes: w, d, h, m, s for
 			weeks, days, hours, minutes, and seconds. (Thanks
diff --git a/bin/named/query.c b/bin/named/query.c
index 5d16961e2be..9b1fcbf609d 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -257,6 +257,9 @@ query_error(ns_client_t *client, isc_result_t result, int line) {
 		break;
 	}
 
+	if (ns_g_server->log_queries)
+		loglevel = ISC_LOG_INFO;
+
 	log_queryerror(client, result, line, loglevel);
 
 	ns_client_error(client, result);