From: Mark Andrews <marka@isc.org>
Date: Wed, 2 Jun 2010 00:58:54 +0000 (+0000)
Subject: 2908.   [bug]           It was possible for re-signing to stop after removing
X-Git-Tag: v9.7.1b1~78^2~14
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=29f0da7fb84ea8010175769baecd12ab20903bb4;p=thirdparty%2Fbind9.git

2908.   [bug]           It was possible for re-signing to stop after removing
                        a DNSKEY. [RT #21384]
---

diff --git a/CHANGES b/CHANGES
index a2c56e2dfe6..200036dfb9b 100644
--- 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 986d0efd02a..a2cd3724a96 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.568 2010/05/28 03:15:48 marka Exp $ */
+/* $Id: zone.c,v 1.569 2010/06/02 00:58:54 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);