no AAAA shortcuts.

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

diff --git a/doc/Changelog b/doc/Changelog
index 948fd24c4de05b630aa41e9e56ec4a3bffcb7da9..f494e181ea6fa880804260988b9bda19874254cf 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 13 November 2017: Wouter 
        - Fix #2801: Install libunbound.pc.
        - Fix qname minimisation to send AAAA queries at zonecut like type A.
+       - reverted AAAA change.
 
 7 November 2017: Wouter 
        - Fix #2492: Documentation libunbound.

diff --git a/iterator/iterator.c b/iterator/iterator.c
index c69ef4c73152abe16d34b355f7e8b25d553aba45..d67d8eb3683020e5345ad23a43ae834128a914c4 100644 (file)
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2154,8 +2154,7 @@ processQueryTargets(struct module_qstate* qstate, struct iter_qstate* iq,
                }
                if(labdiff < 1 || (labdiff < 2 
                        && (iq->qchase.qtype == LDNS_RR_TYPE_DS
-                       || iq->qchase.qtype == LDNS_RR_TYPE_A
-                       || iq->qchase.qtype == LDNS_RR_TYPE_AAAA)))
+                       || iq->qchase.qtype == LDNS_RR_TYPE_A)))
                        /* Stop minimising this query, resolve "as usual" */
                        iq->minimisation_state = DONOT_MINIMISE_STATE;
                else if(!qstate->no_cache_lookup) {