From: Mark Andrews <marka@isc.org>
Date: Tue, 28 May 2002 05:49:20 +0000 (+0000)
Subject: 1207.   [bug]           REQUIRE that DNS_DBADD_MERGE only be set when adding
X-Git-Tag: v9.0.1^2~8341
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=da091cda77fa951e682119c3df84f60a62bed702;p=thirdparty%2Fbind9.git

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 3e1390f95ad..c9bdf311c9b 100644
--- 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 40808b67069..9dc15ae5eeb 100644
--- 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)