[v9_9] silence RPZ log messages

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

diff --git a/CHANGES b/CHANGES
index 2d45c10312c1c652c58c6fbf361f343a91a2f087..c3618c7b6014a67d347c8f3bc34f2229b51af428 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,9 @@
 
 4052.  [bug]           Fix a leak of query fetchlock. [RT #38454]
 
+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 eae3e617805a954a68bce5e89f5a546cceb9edcf..706fdecd664d277d09944730c8e5cc18a4ac4140 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -4737,6 +4737,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:
@@ -4755,12 +4757,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;
                        }
                }