From: Wouter Wijngaards Date: Tue, 10 Feb 2015 14:01:45 +0000 (+0000) Subject: - Fix scrubber with harden-glue turned off to reject NS (and other X-Git-Tag: release-1.5.2rc1~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=025f36b169a3731deb7ce6bc7216520f0bda7f67;p=thirdparty%2Funbound.git - Fix scrubber with harden-glue turned off to reject NS (and other not-address) records. git-svn-id: file:///svn/unbound/trunk@3330 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 93e4e5fb8..2dda130a7 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +10 February 2015: Wouter + - Fix scrubber with harden-glue turned off to reject NS (and other + not-address) records. + 9 February 2015: Wouter - Fix validation failure in case upstream forwarder (ISC BIND) does not have the same trust anchors and decides to insert unsigned NS diff --git a/iterator/iter_scrub.c b/iterator/iter_scrub.c index b2248bc0c..1c81975b2 100644 --- a/iterator/iter_scrub.c +++ b/iterator/iter_scrub.c @@ -680,7 +680,9 @@ scrub_sanitize(sldns_buffer* pkt, struct msg_parse* msg, * (we dont want its glue that was approved * during the normalize action) */ del_addi = 1; - } else if(!env->cfg->harden_glue) { + } else if(!env->cfg->harden_glue && ( + rrset->type == LDNS_RR_TYPE_A || + rrset->type == LDNS_RR_TYPE_AAAA)) { /* store in cache! Since it is relevant * (from normalize) it will be picked up * from the cache to be used later */