From: Mark Andrews <marka@isc.org>
Date: Tue, 28 Aug 2007 00:05:06 +0000 (+0000)
Subject: 2219.   [bug]           Apply zone consistancy checks to additions, not
X-Git-Tag: v9.4.2rc1~39^2~21
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d91df50b670d92d0ab784b741e2ee9af7f2dc4a1;p=thirdparty%2Fbind9.git

2219.   [bug]           Apply zone consistancy checks to additions, not
                        removals, when updating. [RT #17097]
---

diff --git a/CHANGES b/CHANGES
index 243b25021d2..134fd598a16 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2219.	[bug]		Apply zone consistancy checks to additions, not
+			removals, when updating. [RT #17097]
+
 2218.	[bug]		Remove unnecessary REQUIRE from dns_validator_create().
 			[RT #16976]
 
diff --git a/bin/named/update.c b/bin/named/update.c
index eb9e8ddac0c..4d60dcf3502 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: update.c,v 1.136 2007/08/27 04:31:42 marka Exp $ */
+/* $Id: update.c,v 1.137 2007/08/28 00:05:06 marka Exp $ */
 
 #include <config.h>
 
@@ -2187,7 +2187,7 @@ remove_orphaned_ds(dns_db_t *db, dns_dbversion_t *newver, dns_diff_t *diff) {
 	for (t = ISC_LIST_HEAD(diff->tuples);
 	     t != NULL;
 	     t = ISC_LIST_NEXT(t, link)) {
-		if (t->op != DNS_DIFFOP_DEL ||
+		if (t->op != DNS_DIFFOP_ADD ||
 		    t->rdata.type != dns_rdatatype_ns)
 			continue;
 		CHECK(rrset_exists(db, newver, &t->name, dns_rdatatype_ns, 0,
@@ -2238,7 +2238,7 @@ check_mx(ns_client_t *client, dns_zone_t *zone,
 	for (t = ISC_LIST_HEAD(diff->tuples);
 	     t != NULL;
 	     t = ISC_LIST_NEXT(t, link)) {
-		if (t->op != DNS_DIFFOP_DEL ||
+		if (t->op != DNS_DIFFOP_ADD ||
 		    t->rdata.type != dns_rdatatype_mx)
 			continue;