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 to pick up other class local zone information before unlock.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2021-12-13 10:00:53 +01:00
parent 2c1a5203a5
commit 83c712ca60
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Changelog
View file

@ -1,3 +1,6 @@
13 December 2021: Wouter
- Fix to pick up other class local zone information before unlock.
10 December 2021: George 10 December 2021: George
- Allow local-data for classes other than IN to inherit a configured - Allow local-data for classes other than IN to inherit a configured
local-zone's type if possible, instead of defaulting to type local-zone's type if possible, instead of defaulting to type

7
services/localzone.c
View file

@ -1057,6 +1057,9 @@ lz_setup_implicit(struct local_zones* zones, struct config_file* cfg)
rr_name, len, labs, LDNS_RR_CLASS_IN, rr_type); rr_name, len, labs, LDNS_RR_CLASS_IN, rr_type);
if(z) { if(z) {
uint8_t* name = memdup(z->name, z->namelen); uint8_t* name = memdup(z->name, z->namelen);
size_t znamelen = z->namelen;
int znamelabs = z->namelabs;
enum localzone_type ztype = z->type;
lock_rw_unlock(&zones->lock); lock_rw_unlock(&zones->lock);
if(!name) { if(!name) {
log_err("out of memory"); log_err("out of memory");
@ -1068,8 +1071,8 @@ lz_setup_implicit(struct local_zones* zones, struct config_file* cfg)
z = z =
#endif #endif
lz_enter_zone_dname(zones, name, lz_enter_zone_dname(zones, name,
z->namelen, z->namelabs, znamelen, znamelabs,
z->type, rr_class))) { ztype, rr_class))) {
free(rr_name); free(rr_name);
return 0; return 0;
} }