- Fix #1237 - Wrong resolving in chain, for norec queries that get

  SERVFAIL returned.

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

diff --git a/doc/Changelog b/doc/Changelog
index d340cb1fa085fd1595417dab68728bd7528390fc..fdb376c909c9f5e65cbde642b7cd29b308be8bc9 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 17 March 2017: Wouter
        - Patch for view functionality for local-data-ptr from Björn Ketelaars.
+       - Fix #1237 - Wrong resolving in chain, for norec queries that get
+         SERVFAIL returned.
 
 16 March 2017: Wouter
        - Fix that SHM is not inited if not enabled.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index a8447775af1a91a83eceaed2cf45cb9956e227fc..cd0a03c7866f5e9473b9edc238d3c5d7b6c1db39 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -1351,7 +1351,7 @@ processInitRequest3(struct module_qstate* qstate, struct iter_qstate* iq,
 
        /* If the RD flag wasn't set, then we just finish with the 
         * cached referral as the response. */
-       if(!(qstate->query_flags & BIT_RD)) {
+       if(!(qstate->query_flags & BIT_RD) && iq->deleg_msg) {
                iq->response = iq->deleg_msg;
                if(verbosity >= VERB_ALGO && iq->response)
                        log_dns_msg("no RD requested, using delegation msg",