upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix so local zone types always_nodata and always_deny can be used

Browse source 
from the config file.
This commit is contained in:
W.C.A. Wijngaards 2021-01-12 13:39:07 +01:00
parent 3322f631e5
commit d1b92a6ce2
4 changed files with 290 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Changelog
View file

@ -1,6 +1,8 @@
12 January 2021: Wouter 12 January 2021: Wouter
- Fix #397: [Feature request] add new type always_null to local-zone - Fix #397: [Feature request] add new type always_null to local-zone
similar to always_nxdomain. similar to always_nxdomain.
- Fix so local zone types always_nodata and always_deny can be used
from the config file.
8 January 2021: Wouter 8 January 2021: Wouter
- Merge PR #391 from fhriley: Add start_time to reply callbacks so - Merge PR #391 from fhriley: Add start_time to reply callbacks so

5
doc/example.conf.in
View file

@ -704,8 +704,9 @@ server:
# o inform acts like transparent, but logs client IP address # o inform acts like transparent, but logs client IP address
# o inform_deny drops queries and logs client IP address # o inform_deny drops queries and logs client IP address
# o inform_redirect redirects queries and logs client IP address # o inform_redirect redirects queries and logs client IP address
# o always_transparent, always_refuse, always_nxdomain, resolve in # o always_transparent, always_refuse, always_nxdomain, always_nodata,
# that way but ignore local data for that name # always_deny resolve in that way but ignore local data for
# that name
# o always_null returns 0.0.0.0 or ::0 for any name in the zone. # o always_null returns 0.0.0.0 or ::0 for any name in the zone.
# o noview breaks out of that view towards global local-zones. # o noview breaks out of that view towards global local-zones.
# #

559
util/configparser.c
View file

File diff suppressed because it is too large Load diff

5
util/configparser.y
View file

@ -2030,6 +2030,8 @@ server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG
&& strcmp($3, "always_transparent")!=0 && strcmp($3, "always_transparent")!=0
&& strcmp($3, "always_refuse")!=0 && strcmp($3, "always_refuse")!=0
&& strcmp($3, "always_nxdomain")!=0 && strcmp($3, "always_nxdomain")!=0
&& strcmp($3, "always_nodata")!=0
&& strcmp($3, "always_deny")!=0
&& strcmp($3, "always_null")!=0 && strcmp($3, "always_null")!=0
&& strcmp($3, "noview")!=0 && strcmp($3, "noview")!=0
&& strcmp($3, "inform")!=0 && strcmp($3, "inform_deny")!=0 && strcmp($3, "inform")!=0 && strcmp($3, "inform_deny")!=0
@ -2039,7 +2041,8 @@ server_local_zone: VAR_LOCAL_ZONE STRING_ARG STRING_ARG
"refuse, redirect, transparent, " "refuse, redirect, transparent, "
"typetransparent, inform, inform_deny, " "typetransparent, inform, inform_deny, "
"inform_redirect, always_transparent, " "inform_redirect, always_transparent, "
"always_refuse, always_nxdomain, always_null, " "always_refuse, always_nxdomain, "
"always_nodata, always_deny, always_null, "
"noview, nodefault or ipset"); "noview, nodefault or ipset");
free($2); free($2);
free($3); free($3);