From 6c2fa12f105d9fec4af5acd73bf8f4f9a71cec69 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 13 Nov 2017 14:15:10 +0000
Subject: [PATCH] no AAAA shortcuts.

git-svn-id: file:///svn/unbound/trunk@4403 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog       | 1 +
 iterator/iterator.c | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 948fd24c4..f494e181e 100644
--- 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 c69ef4c73..d67d8eb36 100644
--- 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) {