- Fix #1412: QNAME minimisation strict mode not honored

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

diff --git a/doc/Changelog b/doc/Changelog
index 7b1c47acfacd9e63632f6663c5342689eca5d3af..7ba78b144154fa218dab950ed6b3777e8799e2a6 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+4 September 2017: Ralph
+       - Fix #1412: QNAME minimisation strict mode not honored
+
 4 September 2017: Wouter
        - tag 1.6.6rc1
        - makedist fix for windows binaries, with openssl 1.1.0 windres fix,

diff --git a/iterator/iterator.c b/iterator/iterator.c
index 2f62915a57a503bb3b8c4c54f79f201851433289..01ac883e81e8b51d98ee8370edcb612d5f966b61 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2169,7 +2169,6 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                }
        }
        if(iq->minimisation_state == SKIP_MINIMISE_STATE) {
-               iq->minimise_timeout_count++;
                if(iq->minimise_timeout_count < MAX_MINIMISE_TIMEOUT_COUNT)
                        /* Do not increment qname, continue incrementing next 
                         * iteration */
@@ -2210,6 +2209,8 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                if(!(iq->chase_flags & BIT_RD) && !iq->ratelimit_ok)
                    infra_ratelimit_dec(qstate->env->infra_cache, iq->dp->name,
                        iq->dp->namelen, *qstate->env->now);
+               if(qstate->env->cfg->qname_minimisation)
+                       iq->minimisation_state = SKIP_MINIMISE_STATE;
                return next_state(iq, QUERYTARGETS_STATE);
        }
        outbound_list_insert(&iq->outlist, outq);
@@ -2259,8 +2260,10 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 
        if(iq->response == NULL) {
                /* Don't increment qname when QNAME minimisation is enabled */
-               if(qstate->env->cfg->qname_minimisation)
+               if(qstate->env->cfg->qname_minimisation) {
+                       iq->minimise_timeout_count++;
                        iq->minimisation_state = SKIP_MINIMISE_STATE;
+               }
                iq->chase_to_rd = 0;
                iq->dnssec_lame_query = 0;
                verbose(VERB_ALGO, "query response was timeout");