From: Mark Andrews <marka@isc.org>
Date: Fri, 26 May 2006 02:48:26 +0000 (+0000)
Subject: 2032.   [bug]           Remove a INSIST in query_addadditional2(). [RT #16074]
X-Git-Tag: v9.4.0a6~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b0ee0ba86cb633a6722377ec58499a80aa84b31;p=thirdparty%2Fbind9.git

2032.   [bug]           Remove a INSIST in query_addadditional2(). [RT #16074]
---

diff --git a/CHANGES b/CHANGES
index 1b68f25f573..d94434d91e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 
 	--- 9.4.0a6 released ---
 
+2032.	[bug]		Remove a INSIST in query_addadditional2(). [RT #16074]
+
 2031.	[bug]		Emit a error message when "rndc refresh" is called on
 			a non slave/stub zone. [RT # 16073]
 
diff --git a/bin/named/query.c b/bin/named/query.c
index 2a65957a0f8..96881bdd4b3 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.257.18.30 2006/05/18 03:14:03 marka Exp $ */
+/* $Id: query.c,v 1.257.18.31 2006/05/26 02:48:26 marka Exp $ */
 
 /*! \file */
 
@@ -1761,8 +1761,6 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
 	/* Find AAAA RRset with sig RRset */
 	result = dns_db_findrdataset(db, node, version, dns_rdatatype_aaaa,
 				     0, client->now, rdataset, sigrdataset);
-	/* The NXDOMAIN case should be covered above */
-	INSIST(result != DNS_R_NCACHENXDOMAIN);
 	/*
 	 * If we can't promote glue/pending from the cache to secure
 	 * then drop it.
@@ -1777,13 +1775,6 @@ query_addadditional2(void *arg, dns_name_t *name, dns_rdatatype_t qtype) {
 			dns_rdataset_disassociate(sigrdataset);
 		result = ISC_R_NOTFOUND;
 	}
-	if (result == DNS_R_NCACHENXRRSET) {
-		dns_rdataset_disassociate(rdataset);
-		/*
-		 * Negative cache entries don't have sigrdatasets.
-		 */
-		INSIST(! dns_rdataset_isassociated(sigrdataset));
-	}
 	if (result == ISC_R_SUCCESS) {
 		ISC_LIST_APPEND(cfname.list, rdataset, link);
 		rdataset = NULL;