Fix prz SERVFAILs after failed zone transfers (RT23246).

diff --git a/CHANGES b/CHANGES
index cd394820dac2e2c904e5a05589d3d886d91e29e9..75c5b18ee40d469d3ab80b0bea6e063c9a2abf17 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3022.  [bug]           Fixed prz SERVFAILs after failed zone transfers
+                        [RT #23246]
+
 3021.  [bug]           Change #3010 was incomplete. [RT #22296]
 
 3020.  [bug]           auto-dnssec failed to correctly update the zone when

diff --git a/bin/named/query.c b/bin/named/query.c
index bad8de0540dd0d4531ccb27b3eef1a6e10b81dd7..b00689186d35b9505248de9d8ccb174a38ce9d48 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.354 2011/02/03 07:35:55 marka Exp $ */
+/* $Id: query.c,v 1.355 2011/02/18 15:18:30 smann Exp $ */
 
 /*! \file */
 
@@ -4041,8 +4041,8 @@ rpz_find(ns_client_t *client, dns_rdatatype_t qtype, dns_name_t *qnamef,
        version = NULL;
        result = rpz_getdb(client, rpz_type, qnamef, zonep, dbp, &version);
        if (result != ISC_R_SUCCESS) {
-               *policyp = DNS_RPZ_POLICY_ERROR;
-               return (DNS_R_SERVFAIL);
+               *policyp = DNS_RPZ_POLICY_MISS;
+               return (DNS_R_NXDOMAIN);
        }
 
        dns_fixedname_init(&fixed);