From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 26 May 2016 06:49:44 +0000 (+0000)
Subject: - Updated patch from Charles Walker.
X-Git-Tag: release-1.5.9rc1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74603017b6c5fb9ec61144ea4f25d2457d9835d8;p=thirdparty%2Funbound.git

- Updated patch from Charles Walker.


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

diff --git a/doc/Changelog b/doc/Changelog
index 8b2b7c7ca..315502a78 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+26 May 2016: Wouter
+	- Updated patch from Charles Walker.
+
 24 May 2016: Wouter
 	- disable-dnssec-lame-check config option from Charles Walker.
 	- remove memory leak from lame-check patch.
diff --git a/iterator/iterator.c b/iterator/iterator.c
index 465bf6540..f521940a7 100644
--- a/iterator/iterator.c
+++ b/iterator/iterator.c
@@ -2465,8 +2465,7 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
 		verbose(VERB_ALGO, "cleared outbound list for query restart");
 		/* go to INIT_REQUEST_STATE for new qname. */
 		return next_state(iq, INIT_REQUEST_STATE);
-	} else if(!qstate->env->cfg->disable_dnssec_lame_check 
-                      && type == RESPONSE_TYPE_LAME) {
+	} else if(type == RESPONSE_TYPE_LAME) {
 		/* Cache the LAMEness. */
 		verbose(VERB_DETAIL, "query response was %sLAME",
 			dnsseclame?"DNSSEC ":"");