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 883: error for duplicate local zone entry.

Browse source 
git-svn-id: file:///svn/unbound/trunk@3858 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2016-09-15 10:59:26 +00:00
parent c879d6824b
commit 10e6b1ed99
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 @@
15 September 2016: Wouter
- Fix 883: error for duplicate local zone entry.
15 September 2016: Ralph
- fix potential memory leak in daemon/remote.c and nullpointer
dereference in validator/autotrust.

7
services/localzone.c
View file

@ -185,7 +185,10 @@ lz_enter_zone_dname(struct local_zones* zones, uint8_t* nm, size_t len,
lock_rw_unlock(&z->lock);
local_zone_delete(z);
lock_rw_unlock(&zones->lock);
return NULL;
/* find the correct zone, so not an error for duplicate */
z = local_zones_find(zones, nm, len, labs, c);
lock_rw_wrlock(&z->lock);
return z;
}
lock_rw_unlock(&zones->lock);
return z;
@ -617,7 +620,7 @@ lz_enter_override(struct local_zones* zones, char* zname, char* netblock,
lock_rw_unlock(&z->lock);
log_err("duplicate local-zone-override %s %s",
zname, netblock);
return 0;
return 1;
}
}