2380. [bug] dns_view_find() was not returning NXDOMAIN/NXRRSET

                        proofs which, in turn, caused validation failures
                        for insecure zones immediately below a secure zone
                        the server was authoritative for. [RT #18112]

diff --git a/CHANGES b/CHANGES
index 07ea95ce25ec8c9e0b2a72b2b7e9b49e66794d28..31f1073f790d8a9faa8a42ae0b1707e66536edc5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2380.  [bug]           dns_view_find() was not returning NXDOMAIN/NXRRSET
+                       proofs which, in turn, caused validation failures
+                       for insecure zones immediately below a secure zone
+                       the server was authoritative for. [RT #18112] 
+
 2379.  [contrib]       queryperf/gen-data-queryperf.py: removed redundant
                        TLDs and supported RRs with TTLs [RT #17972]
 

diff --git a/lib/dns/view.c b/lib/dns/view.c
index 90b7e938b3cb76ec1d8c5760e80bebf6b0d7e9a4..a447bc16c8349fc825ef356cd938023d3862818c 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: view.c,v 1.103.2.5.2.17 2007/08/28 07:19:14 tbox Exp $ */
+/* $Id: view.c,v 1.103.2.5.2.18 2008/06/17 03:30:30 marka Exp $ */
 
 #include <config.h>
 
@@ -822,17 +822,6 @@ dns_view_find(dns_view_t *view, dns_name_t *name, dns_rdatatype_t type,
        }
 
  cleanup:
-       if (result == DNS_R_NXDOMAIN || result == DNS_R_NXRRSET) {
-               /*
-                * We don't care about any DNSSEC proof data in these cases.
-                */
-               if (dns_rdataset_isassociated(rdataset))
-                       dns_rdataset_disassociate(rdataset);
-               if (sigrdataset != NULL &&
-                   dns_rdataset_isassociated(sigrdataset))
-                       dns_rdataset_disassociate(sigrdataset);
-       }
-
        if (dns_rdataset_isassociated(&zrdataset)) {
                dns_rdataset_disassociate(&zrdataset);
                if (dns_rdataset_isassociated(&zsigrdataset))