From: Mark Andrews <marka@isc.org>
Date: Wed, 10 Nov 2004 21:57:46 +0000 (+0000)
Subject: 1754.   [bug]           We wern't always attempting to query the parent
X-Git-Tag: v9.2.5rc1~28^2~46
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=e3d982f4a8e8a974231042ff4303ed8e82dfbdf9;p=thirdparty%2Fbind9.git

1754.   [bug]           We wern't always attempting to query the parent
                        server for the DS records at the zone cut.
                        [RT #12774]
---

diff --git a/CHANGES b/CHANGES
index 2be7680a6d4..a5f1c8a2e12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,7 +22,9 @@
 
 1755.	[placeholder]	rt6636
 
-1754.	[placeholder]	rt12774
+1754.	[bug]		We wern't always attempting to query the parent
+			server for the DS records at the zone cut.
+			[RT #12774]
 
 1753.	[bug]		Don't serve a slave zone which has no NS records.
 			[RT #12894]
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 29936a907bc..6002aeb116f 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.297 2004/11/10 21:46:48 marka Exp $ */
+/* $Id: resolver.c,v 1.298 2004/11/10 21:57:46 marka Exp $ */
 
 #include <config.h>
 
@@ -5413,13 +5413,16 @@ resquery_response(isc_task_t *task, isc_event_t *event) {
 				return;
 			}
 			findoptions = 0;
+			if (dns_rdatatype_atparent(fctx->type))
+				findoptions |= DNS_DBFIND_NOEXACT;
 			if ((options & DNS_FETCHOPT_UNSHARED) == 0)
 				name = &fctx->name;
 			else
 				name = &fctx->domain;
 			result = dns_view_findzonecut(fctx->res->view,
 						      name, fname,
-						      now, 0, ISC_TRUE,
+						      now, findoptions,
+						      ISC_TRUE,
 						      &fctx->nameservers,
 						      NULL);
 			if (result != ISC_R_SUCCESS) {