diff options
| author |   brad <brad@openbsd.org> | 2015-02-11 00:09:33 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2015-02-11 00:09:33 +0000 |
| commit | 3e38fc85e618eba99560e677fa2b2920965612b3 (patch) | |
| tree | fe14c7cb1c35d470fc44233b51955f8434dc9839 | |
| parent | atomic_{cas,swap}_ptr takes a volatile void *, not a volatile void **. (diff) | |
| download | wireguard-openbsd-3e38fc85e618eba99560e677fa2b2920965612b3.tar.xz wireguard-openbsd-3e38fc85e618eba99560e677fa2b2920965612b3.zip | |
Merge in a commit from upstream..
- Fix scrubber with harden-glue turned off to reject NS (and other
not-address) records.
ok sthen@
| -rw-r--r-- | usr.sbin/unbound/iterator/iter_scrub.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/unbound/iterator/iter_scrub.c b/usr.sbin/unbound/iterator/iter_scrub.c index b2248bc0cbc..1c81975b234 100644 --- a/usr.sbin/unbound/iterator/iter_scrub.c +++ b/usr.sbin/unbound/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 */ |