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 ebe490a9c0c52b622c5cb2daa07d2438e65a5ef7..93dba70c4adfa333d5a875c23b201e5318bebbe8 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 68ee099ce5446810fe83496abeb95f3cda313af1..6f20e893b65a28655e284adeb15303de870c2973 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.143.128.6 2008/05/29 22:54:02 each Exp $ */
+/* $Id: view.c,v 1.143.128.7 2008/06/17 03:22:24 marka Exp $ */
 
 /*! \file */
 
@@ -872,17 +872,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))