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 2be7680a6d46526627bce2dd9df2d01b780a2226..a5f1c8a2e12a948aaba1208428d55ddb15373390 100644 (file)
--- 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 29936a907bc54dd89160dbcfe3a992a6842b7bff..6002aeb116f8d8f8b90a4a48fa4f98701a06e280 100644 (file)
--- 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) {