From 2a4f4945657f4dd321d30a01aa5d74159c74dbcb Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 19 May 2011 04:28:33 +0000
Subject: [PATCH] Change 3114 wasn't complete--needed to remove another call to
 dns_db_resigned().

---
 CHANGES        | 4 ++--
 lib/dns/zone.c | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index 140e6183c4..bbda76ac3c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-3114.	[bug]		Retain signed RRSET if key is inactive and there is
-			no replacement key. [RT #23136 task 1]
+3114.	[bug]		Retain expired RRSIGs in dynamic zones if key is
+			inactive and there is no replacement key. [RT #23136]
 
 3113.	[doc]		Document the relationship between serial-query-rate
 			and NOTIFY messages.
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index bb93d2431b..4a829af400 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.605 2011/05/19 00:31:57 smann Exp $ */
+/* $Id: zone.c,v 1.606 2011/05/19 04:28:33 each Exp $ */
 
 /*! \file */
 
@@ -5015,11 +5015,6 @@ zone_resigninc(dns_zone_t *zone) {
 		/* XXXMPA increase number of RRsets signed pre call */
 		if (covers == dns_rdatatype_soa || i++ > zone->signatures ||
 		    resign > stop) {
-			/*
-			 * Ensure that we don't loop resigning the SOA.
-			 */
-			if (covers == dns_rdatatype_soa)
-				dns_db_resigned(db, &rdataset, version);
 			dns_rdataset_disassociate(&rdataset);
 			break;
 		}