From: Evan Hunt <each@isc.org>
Date: Mon, 2 Feb 2015 23:49:36 +0000 (-0800)
Subject: [master] silence RPZ log messages
X-Git-Tag: v9.11.0a1~1067
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d8890e779c0a74a8738a746f130a4bed6d6954ca;p=thirdparty%2Fbind9.git

[master] silence RPZ log messages

4050.	[cleanup]	Silence occasional spurious "duplicate query" log
			messages from RPZ. [RT #38510]
---

diff --git a/CHANGES b/CHANGES
index aa1f79d3574..df23a953940 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4050.	[cleanup]	Silence occasional spurious "duplicate query" log
+			messages from RPZ. [RT #38510]
+
 4049.	[bug]		CDS and CDNSKEY had the wrong attributes. [RT #38491]
 
 4048.	[bug]		adb hash table was not being grown. [RT #38470]
diff --git a/bin/named/query.c b/bin/named/query.c
index c2d87ac8e65..b592f742e9a 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -5266,6 +5266,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
 					       DNS_RPZ_DONE_IPv4);
 				break;
 			case DNS_R_DELEGATION:
+			case DNS_R_DUPLICATE:
+			case DNS_R_DROP:
 				goto cleanup;
 			case DNS_R_EMPTYNAME:
 			case DNS_R_NXRRSET:
@@ -5284,12 +5286,13 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype, isc_result_t qresult,
 			case ISC_R_FAILURE:
 				rpz_rewrite_ns_skip(client, nsname, result,
 						DNS_RPZ_DEBUG_LEVEL3,
-						" NS db_find()");
+						" NS rpz_rrset_find() ");
 				continue;
 			default:
 				rpz_rewrite_ns_skip(client, nsname, result,
 						DNS_RPZ_INFO_LEVEL,
-						" unrecognized NS db_find()");
+						" unrecognized NS"
+						" rpz_rrset_find() ");
 				continue;
 			}
 		}