1207. [bug] REQUIRE that DNS_DBADD_MERGE only be set when adding

                        a rdataset to a zone db in the rbtdb implementation of
                        addrdataset.

diff --git a/CHANGES b/CHANGES
index 3e1390f95adf2f46fbea6773e1a869a1fb151092..c9bdf311c9b97e4a91276f6372697b91c800dae7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1207.  [bug]           REQUIRE that DNS_DBADD_MERGE only be set when adding
+                       a rdataset to a zone db in the rbtdb implementation of
+                       addrdataset.
+
 1206.  [bug]           dns_name_downcase() enforce requirement that
                        target != NULL or name->buffer != NULL.
 

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 40808b670697b75da68c9dae2173e45ef2eb26d9..9dc15ae5eebbbaad84764129d6dcf44706c8dc2c 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbtdb.c,v 1.174 2001/12/08 00:37:05 bwelling Exp $ */
+/* $Id: rbtdb.c,v 1.175 2002/05/28 05:49:20 marka Exp $ */
 
 /*
  * Principal Author: Bob Halley
@@ -3368,9 +3368,10 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *rbtnode, rbtdb_version_t *rbtversion,
         * Caller must be holding the node lock.
         */
 
-       if ((options & DNS_DBADD_MERGE) != 0)
+       if ((options & DNS_DBADD_MERGE) != 0) {
+               REQUIRE(rbtversion != NULL);
                merge = ISC_TRUE;
-       else
+       } else
                merge = ISC_FALSE;
 
        if ((options & DNS_DBADD_FORCE) != 0)