upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-01-02 21:09:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:NLnetLabs/unbound

Browse source
This commit is contained in:
W.C.A. Wijngaards 2020-09-23 11:14:50 +02:00
commit e41daa954e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -2,6 +2,9 @@
- Fix #305: dnstap logging significantly affects unbound performance
(regression in 1.11).
23 September 2020: Ralph
- Fix edns-client-tags get_option typo
21 September 2020: Ralph
- Fix #304: dnstap logging not recovering after dnstap process restarts

2
util/config_file.c
View file

@ -1149,7 +1149,7 @@ config_get_option(struct config_file* cfg, const char* opt,
else O_LS3(opt, "access-control-tag-action", acl_tag_actions)
else O_LS3(opt, "access-control-tag-data", acl_tag_datas)
else O_LS2(opt, "access-control-view", acl_view)
else O_LS2(opt, "edns_client_tags", edns_client_tags)
else O_LS2(opt, "edns-client-tags", edns_client_tags)
#ifdef USE_IPSECMOD
else O_YNO(opt, "ipsecmod-enabled", ipsecmod_enabled)
else O_YNO(opt, "ipsecmod-ignore-bogus", ipsecmod_ignore_bogus)