Change 3114 wasn't complete--needed to remove another call to

dns_db_resigned().

diff --git a/CHANGES b/CHANGES
index 140e6183c4debec16d3512eac1703ba590e6c6d9..bbda76ac3c0b3ef85a02c669070fbbd49483ef48 100644 (file)
--- 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 bb93d2431b328465d2a712190bae3de3c0b2e429..4a829af400e292ad729900758d73af7130d7aa20 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.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;
                }