From: Mark Andrews <marka@isc.org>
Date: Tue, 4 Oct 2016 23:35:18 +0000 (+1100)
Subject: 4472.   [bug]           Named could fail to find the correct NSEC3 records when
X-Git-Tag: v9.12.0a1~753
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7fbe85c6d7e47a8dfdc018a1f5fae2e8eb6cbd60;p=thirdparty%2Fbind9.git

4472.   [bug]           Named could fail to find the correct NSEC3 records when
                        a zone was update between looking for the answer and
                        looking for the NSEC3 records proving non-existance
                        of the answer. [RT #43247]
---

diff --git a/CHANGES b/CHANGES
index 97ed3a520df..74a68ec2d32 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+4472.	[bug]		Named could fail to find the correct NSEC3 records when
+			a zone was update between looking for the answer and
+			looking for the NSEC3 records proving non-existance
+			of the answer. [RT #43247]
+
 	--- 9.11.0 released ---
 
 	--- 9.11.0rc3 released ---
diff --git a/bin/named/query.c b/bin/named/query.c
index e4753941adc..bd9df5cbfe5 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -3621,7 +3621,7 @@ query_addwildcardproof(ns_client_t *client, dns_db_t *db,
 		/*
 		 * Add closest (provable) encloser NSEC3.
 		 */
-		query_findclosestnsec3(cname, db, NULL, client, rdataset,
+		query_findclosestnsec3(cname, db, version, client, rdataset,
 				       sigrdataset, fname, ISC_TRUE, cname);
 		if (!dns_rdataset_isassociated(rdataset))
 			goto cleanup;
@@ -3660,7 +3660,7 @@ query_addwildcardproof(ns_client_t *client, dns_db_t *db,
 		else
 			dns_name_split(name, labels, NULL, wname);
 
-		query_findclosestnsec3(wname, db, NULL, client, rdataset,
+		query_findclosestnsec3(wname, db, version, client, rdataset,
 				       sigrdataset, fname, ISC_FALSE, NULL);
 		if (!dns_rdataset_isassociated(rdataset))
 			goto cleanup;
@@ -3700,7 +3700,7 @@ query_addwildcardproof(ns_client_t *client, dns_db_t *db,
 		if (result != ISC_R_SUCCESS)
 			goto cleanup;
 
-		query_findclosestnsec3(wname, db, NULL, client, rdataset,
+		query_findclosestnsec3(wname, db, version, client, rdataset,
 				       sigrdataset, fname, nodata, NULL);
 		if (!dns_rdataset_isassociated(rdataset))
 			goto cleanup;