2219. [bug] Apply zone consistancy checks to additions, not

                        removals, when updating. [RT #17097]

diff --git a/CHANGES b/CHANGES
index 243b25021d2911f9b361893a6d39dd3f14786c6f..134fd598a161b21a9728484de60743ef7a866ccc 100644 (file)
--- 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 eb9e8ddac0cf7567094d67e6ce92e0a73537aa08..4d60dcf3502ecb910b81e93fb2f8b421ac03d944 100644 (file)
--- 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;