- Fix above stub queries for type NS and useless delegation point.

git-svn-id: file:///svn/unbound/trunk@4604 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index c8dbb700a54ffceea3b1e6d98f20ac3334eb8e3d..8fd4428b625f57ac6fc3e5ab7dc862e4bd2d63dd 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 5 April 2018: Wouter
        - Combine write of tcp length and tcp query for dns over tls.
        - nitpick fixes in example.conf.
+       - Fix above stub queries for type NS and useless delegation point.
 
 3 April 2018: Wouter
        - Fix #4043: make test fails due to v6 presentation issue in macOS.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 25713af1ef0c5bcfe969395a22a929b246a0ea0e..7c5fa952c692b6396804ed8edc9e45daf767a759 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1299,7 +1299,8 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                delnamelen = iq->qchase.qname_len;
        }
        if(iq->qchase.qtype == LDNS_RR_TYPE_DS || iq->refetch_glue ||
-          (iq->qchase.qtype == LDNS_RR_TYPE_NS && qstate->prefetch_leeway)) {
+          (iq->qchase.qtype == LDNS_RR_TYPE_NS && qstate->prefetch_leeway
+          && can_have_last_resort(qstate->env, delname, delnamelen, iq->qchase.qclass))) {
                /* remove first label from delname, root goes to hints,
                 * but only to fetch glue, not for qtype=DS. */
                /* also when prefetching an NS record, fetch it again from
@@ -1439,6 +1440,12 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
                                verbose(VERB_ALGO, 
                                        "cache delegation was useless:");
                                delegpt_log(VERB_ALGO, iq->dp);
+                               if(!can_have_last_resort(qstate->env, delname, delnamelen, iq->qchase.qclass)) {
+                                       verbose(VERB_ALGO, "useless dp "
+                                               "but cannot go up, servfail");
+                                       return error_response(qstate, id, 
+                                               LDNS_RCODE_SERVFAIL);
+                               }
                                /* go up */
                                delname = iq->dp->name;
                                delnamelen = iq->dp->namelen;