From: Mark Andrews <marka@isc.org>
Date: Wed, 30 Dec 2009 02:26:30 +0000 (+0000)
Subject: more for:
X-Git-Tag: v9.4.3-P1~2^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=502dc92f5828d46fafe4f821d0846d59256720e6;p=thirdparty%2Fbind9.git

more for:
2824.   [bug]           "rndc sign" was not being run by the correct task.
                        [RT #20759]
---

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 1905f2063b3..266fc0b6175 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.545 2009/12/29 22:20:33 marka Exp $ */
+/* $Id: zone.c,v 1.546 2009/12/30 02:26:30 marka Exp $ */
 
 /*! \file */
 
@@ -10293,11 +10293,10 @@ zone_settimer(dns_zone_t *zone, isc_time_t *now) {
 			    isc_time_compare(&zone->dumptime, &next) < 0)
 				next = zone->dumptime;
 		}
-		if (DNS_ZONEKEY_OPTION(zone, DNS_ZONEKEY_MAINTAIN) &&
-		    !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_REFRESHING)) {
+		if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_REFRESHING) &&
+		    !isc_time_isepoch(&zone->refreshkeytime)) {
 			if (isc_time_isepoch(&next) ||
-			    (!isc_time_isepoch(&zone->refreshkeytime) &&
-			    isc_time_compare(&zone->refreshkeytime, &next) < 0))
+			    isc_time_compare(&zone->refreshkeytime, &next) < 0)
 				next = zone->refreshkeytime;
 		}
 		if (!isc_time_isepoch(&zone->resigntime)) {