WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-25 11:14:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix to not change the action override in rpz_config, before

Browse Source 
the cname override has succeeded.
This commit is contained in:
W.C.A. Wijngaards
2026-09-04 17:20:15 +02:00
parent bdfa4d4c5d
commit 2df646e05f
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/Changelog
+2
View File
@@ -2,6 +2,8 @@
- Fix to make rpz_config leave the rpz with correct set up
on failure. The struct is not half configured on exit.
Thanks to Qifan Zhang, Palo Alto Networks, for the report.
- Fix to not change the action override in rpz_config, before
the cname override has succeeded.
3 September 2026: Wouter
- Fix to match NSEC3 hash length to the NSEC3 algorithm,
services/rpz.c
+5 -3
View File
@@ -506,6 +506,7 @@ delete_cname_override(struct rpz* r)
static int
rpz_apply_cfg_elements(struct rpz* r, struct config_auth* p)
{
enum rpz_action action_override;
if(p->rpz_taglist && p->rpz_taglistlen) {
uint8_t* taglist = memdup(p->rpz_taglist, p->rpz_taglistlen);
if(!taglist) {
@@ -526,12 +527,12 @@ rpz_apply_cfg_elements(struct rpz* r, struct config_auth* p)
}
if(p->rpz_action_override) {
r->action_override = rpz_config_to_action(p->rpz_action_override);
action_override = rpz_config_to_action(p->rpz_action_override);
}
else
r->action_override = RPZ_NO_OVERRIDE_ACTION;
action_override = RPZ_NO_OVERRIDE_ACTION;
if(r->action_override == RPZ_CNAME_OVERRIDE_ACTION) {
if(action_override == RPZ_CNAME_OVERRIDE_ACTION) {
uint8_t nm[LDNS_MAX_DOMAINLEN+1];
size_t nmlen = sizeof(nm);
struct regional* newr;
@@ -564,6 +565,7 @@ rpz_apply_cfg_elements(struct rpz* r, struct config_auth* p)
} else {
delete_cname_override(r);
}
r->action_override = action_override;
r->log = p->rpz_log;
r->signal_nxdomain_ra = p->rpz_signal_nxdomain_ra;
if(p->rpz_log_name) {