From: Evan Hunt <each@isc.org>
Date: Tue, 21 May 2013 19:20:54 +0000 (-0700)
Subject: [master] change RRL log category 'query-errors'
X-Git-Tag: v9.10.0a1~331
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f3c8e48b95996c3020d138b87ee8941da29cc124;p=thirdparty%2Fbind9.git

[master] change RRL log category 'query-errors'

3575.	[func]		Changed the logging category for RRL events from
			'queries' to 'query-errors'. [RT #33540]
---

diff --git a/CHANGES b/CHANGES
index a2b06f5a09b..f824667db7f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3575.	[func]		Changed the logging category for RRL events from
+			'queries' to 'query-errors'. [RT #33540]
+
 3574.	[doc]		The 'hostname' keyword was missing from server-id
 			description in the named.conf man page. [RT #33476]
 
diff --git a/bin/named/client.c b/bin/named/client.c
index 1276dcbdc0e..801e0e321de 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1235,8 +1235,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 
 		INSIST(rcode != dns_rcode_noerror &&
 		       rcode != dns_rcode_nxdomain);
-		wouldlog = (ns_g_server->log_queries &&
-			    isc_log_wouldlog(ns_g_lctx, DNS_RRL_LOG_DROP));
+		wouldlog = isc_log_wouldlog(ns_g_lctx, DNS_RRL_LOG_DROP);
 		rrl_result = dns_rrl(client->view, &client->peeraddr,
 				     TCP_CLIENT(client),
 				     dns_rdataclass_in, dns_rdatatype_none,
@@ -1250,7 +1249,8 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
 			 * NS_LOGCATEGORY_RRL.
 			 */
 			if (wouldlog) {
-				ns_client_log(client, NS_LOGCATEGORY_QUERIES,
+				ns_client_log(client,
+					      NS_LOGCATEGORY_QUERY_EERRORS,
 					      NS_LOGMODULE_CLIENT,
 					      DNS_RRL_LOG_DROP,
 					      "%s", log_buf);
diff --git a/bin/named/query.c b/bin/named/query.c
index c6c58581dc7..75d8d7ded66 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -6323,9 +6323,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
 			 * in QryDropped while slipped responses are counted
 			 * with other truncated responses in RespTruncated.
 			 */
-			if (wouldlog && ns_g_server->log_queries) {
-				ns_client_log(client, NS_LOGCATEGORY_QUERIES,
-					      NS_LOGMODULE_CLIENT,
+			if (wouldlog) {
+				ns_client_log(client,
+					      NS_LOGCATEGORY_QUERY_EERRORS,
+					      NS_LOGMODULE_QUERY,
 					      DNS_RRL_LOG_DROP,
 					      "%s", log_buf);
 			}
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index f61bbb76bd2..c6d03a21b36 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4938,9 +4938,7 @@ category notify { null; };
 		    </para>
 		    <para>
 		      Rate limiting of individual requests
-		      is logged in the <command>queries</command> category
-		      and can be controlled with the
-		      <command>querylog</command> option.
+		      is logged in the <command>query-errors</command> category.
 		    </para>
 		  </entry>
 		</row>
diff --git a/lib/dns/rrl.c b/lib/dns/rrl.c
index 6419dfeadf7..d2193942fa6 100644
--- a/lib/dns/rrl.c
+++ b/lib/dns/rrl.c
@@ -1219,7 +1219,8 @@ dns_rrl(dns_view_t *view,
 	 * Make a log message for the caller.
 	 */
 	if (wouldlog)
-		make_log_buf(rrl, e, rrl->log_only ? "would " : NULL,
+		make_log_buf(rrl, e,
+			     rrl->log_only ? "would rate limit " : "rate limit ",
 			     NULL, ISC_FALSE, qname, ISC_FALSE,
 			     rrl_result, resp_result, log_buf, log_buf_len);