2908. [bug] It was possible for re-signing to stop after removing

                        a DNSKEY. [RT #21384]

diff --git a/CHANGES b/CHANGES
index 52fffef85bced6d53e0eeee9b75da0a1f40e2a9a..43c4368b11a952f0ed6ae2eb257fd7ee834b9cef 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2908.  [bug]           It was possible for re-signing to stop after removing
+                       a DNSKEY. [RT #21384]
+
 2907.  [bug]           The export version of libdns had undefined references.
                        [RT #21444]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index b7ed3b326a3ff8fe4e224c65784b827e2080611f..155f44bf154372fa02bfa30515b93eac40dd16a0 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.540.2.25 2010/05/28 03:18:52 marka Exp $ */
+/* $Id: zone.c,v 1.540.2.26 2010/06/02 01:00:28 marka Exp $ */
 
 /*! \file */
 
@@ -4551,7 +4551,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
 
                if (type != dns_rdatatype_dnskey) {
                        result = update_one_rr(db, ver, diff,
-                                              DNS_DIFFOP_DEL, name,
+                                              DNS_DIFFOP_DELRESIGN, name,
                                               rdataset.ttl, &rdata);
                        dns_rdata_reset(&rdata);
                        if (result != ISC_R_SUCCESS)
@@ -4593,7 +4593,7 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                                        break;
                                }
                                result = update_one_rr(db, ver, diff,
-                                                      DNS_DIFFOP_DEL,
+                                                      DNS_DIFFOP_DELRESIGN,
                                                       name, rdataset.ttl,
                                                       &rdata);
                                break;
@@ -4604,8 +4604,9 @@ del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
                 * delete the RRSIG.
                 */
                if (!found)
-                       result = update_one_rr(db, ver, diff, DNS_DIFFOP_DEL,
-                                              name, rdataset.ttl, &rdata);
+                       result = update_one_rr(db, ver, diff,
+                                              DNS_DIFFOP_DELRESIGN, name,
+                                              rdataset.ttl, &rdata);
                dns_rdata_reset(&rdata);
                if (result != ISC_R_SUCCESS)
                        break;
@@ -6417,7 +6418,7 @@ del_sig(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
                            rrsig.keyid != keyid)
                                continue;
                        CHECK(update_one_rr(db, version, diff,
-                                           DNS_DIFFOP_DEL, name,
+                                           DNS_DIFFOP_DELRESIGN, name,
                                            rdataset.ttl, &rdata));
                }
                dns_rdataset_disassociate(&rdataset);