From: Mark Andrews <marka@isc.org>
Date: Wed, 7 Dec 2011 22:48:22 +0000 (+0000)
Subject: 3240.   [bug]           DNSKEY state change events could be missed. [RT #26874]
X-Git-Tag: v9.9.0rc1~71
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=71e4c3ee745b9fbf0c627246a9896589344f613c;p=thirdparty%2Fbind9.git

3240.   [bug]           DNSKEY state change events could be missed. [RT #26874]
---

diff --git a/CHANGES b/CHANGES
index dc3011cdaf4..230ec688f38 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3240.	[bug]		DNSKEY state change events could be missed. [RT #26874]
+
 3239.	[bug]		dns_dnssec_findmatchingkeys needs to use a consistent
 			timestamp. [RT #26883]
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 59d8985f701..782d9d22d51 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.649 2011/12/01 15:58:46 smann Exp $ */
+/* $Id: zone.c,v 1.650 2011/12/07 22:48:22 marka Exp $ */
 
 /*! \file */
 
@@ -14986,6 +14986,9 @@ zone_rekey(dns_zone_t *zone) {
 	CHECK(dns_db_newversion(db, &ver));
 	CHECK(dns_db_getoriginnode(db, &node));
 
+	TIME_NOW(&timenow);
+	now = isc_time_seconds(&timenow);
+
 	dns_zone_log(zone, ISC_LOG_INFO, "reconfiguring zone keys");
 
 	/* Get the SOA record's TTL */
@@ -15085,7 +15088,6 @@ zone_rekey(dns_zone_t *zone) {
 	dns_db_closeversion(db, &ver, commit);
 
 	if (commit) {
-		isc_time_t timenow;
 		dns_difftuple_t *tuple;
 
 		LOCK_ZONE(zone);
@@ -15093,7 +15095,6 @@ zone_rekey(dns_zone_t *zone) {
 
 		zone_needdump(zone, DNS_DUMP_DELAY);
 
-		TIME_NOW(&timenow);
 		zone_settimer(zone, &timenow);
 
 		/* Remove any signatures from removed keys.  */
@@ -15210,13 +15211,6 @@ zone_rekey(dns_zone_t *zone) {
 		UNLOCK_ZONE(zone);
 	}
 
-	/*
-	 * If we are doing automatic key maintenance and the key metadata
-	 * indicates there is a key change event scheduled in the future,
-	 * set the key refresh timer.
-	 */
-	isc_stdtime_get(&now);
-	TIME_NOW(&timenow);
 	isc_time_settoepoch(&zone->refreshkeytime);
 
 	/*