nicer code.

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

diff --git a/doc/Changelog b/doc/Changelog
index df25006e7f8e2d45cb90461ec802297e00c29eae..29a8c13805afc03da3a1ab5d970f647ae6befe8b 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -7,6 +7,7 @@
          take long, but throughput has to be high).
        - fixup iterator operating in no cache conditions (RD flag unset
          after a CNAME).
+       - streamlined code for RD flag setting.
 
 15 February 2008: Wouter
        - added FreeBSD rc.d script to contrib.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 2203f911f89a1e17d504626d1a72738753f12ab2..906c59aa363329e2499cb6fd12b3344e74b78fc2 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -884,15 +884,9 @@ processInitRequest3(struct module_qstate* qstate, struct iter_qstate* iq)
        iq->dnssec_expected = iter_indicates_dnssec(qstate->env, iq->dp, 
                iq->deleg_msg, iq->qchase.qclass);
 
-       /* Reset the RD flag. If this is a query restart, then the RD 
-        * will have been turned off. */
-       if(qstate->query_flags & BIT_RD)
-               iq->chase_flags |= BIT_RD;
-       else    iq->chase_flags &= ~BIT_RD;
-
        /* If the RD flag wasn't set, then we just finish with the 
         * cached referral as the response. */
-       if(!(iq->chase_flags & BIT_RD)) {
+       if(!(qstate->query_flags & BIT_RD)) {
                iq->response = iq->deleg_msg;
                if(verbosity >= VERB_ALGO)
                        log_dns_msg("no RD requested, using delegation msg",