- Fix #4091: Fix that reload of auth-zone does not merge the zonefile

  with the previous contents.

git-svn-id: file:///svn/unbound/trunk@4641 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index 950390980f5609b3295710c12bc8100a02a8d0da..452e4d31b4613cf87baecab3238a1b716bd886a1 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 20 April 2018: Wouter
        - man page documentation for dns-over-tls forward-addr '#' notation.
        - removed free from failed parse case.
+       - Fix #4091: Fix that reload of auth-zone does not merge the zonefile
+         with the previous contents.
 
 19 April 2018: Wouter
        - Can set tls authentication with forward-addr: IP#tls.auth.name

diff --git a/services/authzone.c b/services/authzone.c
index a7141a1ef2ad242ee48033083e4618251ce26ff6..56c4065a4da6a459ac688a07f57e8a5cfa500256 100644 (file)
--- a/services/authzone.c
+++ b/services/authzone.c
@@ -1560,6 +1560,11 @@ auth_zone_read_zonefile(struct auth_zone* z)
                free(n);
                return 0;
        }
+
+       /* clear the data tree */
+       traverse_postorder(&z->data, auth_data_del, NULL);
+       rbtree_init(&z->data, &auth_data_cmp);
+
        memset(&state, 0, sizeof(state));
        /* default TTL to 3600 */
        state.default_ttl = 3600;