From: Wouter Wijngaards Date: Thu, 15 Sep 2016 10:59:26 +0000 (+0000) Subject: - Fix 883: error for duplicate local zone entry. X-Git-Tag: release-1.5.10~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10e6b1ed99d3c99a014f5928e131c2d314bcb12b;p=thirdparty%2Funbound.git - Fix 883: error for duplicate local zone entry. git-svn-id: file:///svn/unbound/trunk@3858 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 292d2e1a2..35cff7d6d 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -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. diff --git a/services/localzone.c b/services/localzone.c index 7091b01a2..1c65259b1 100644 --- a/services/localzone.c +++ b/services/localzone.c @@ -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; } }