[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 aa1f79d3574d6a1fcd254da0efb2946abff958e8..df23a953940afa7296f85b6b3edbd06f7b0c6ee4 100644 (file)
--- 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 c2d87ac8e65db2a82a33524aecec3b4a9f191cff..b592f742e9a58652e41f39c7268984758c04d1f3 100644 (file)
--- 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;
                        }
                }