From: Mark Andrews <marka@isc.org>
Date: Tue, 3 Jan 2006 05:26:29 +0000 (+0000)
Subject: 1943.   [bug]           Set the loadtime after rollimg forward the journal.
X-Git-Tag: v9.2.7b1~91^2~60
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=503ab4e136b843ef431f904709698231f1bc39e3;p=thirdparty%2Fbind9.git

1943.   [bug]           Set the loadtime after rollimg forward the journal.
                        [RT #15647]
---

diff --git a/CHANGES b/CHANGES
index 308f3b15f78..4e0728000ba 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1943.	[bug]		Set the loadtime after rollimg forward the journal.
+			[RT #15647]
+
 1942.	[bug]		If the name of a DNSKEY match that of one in
 			trusted-keys do not attempt to validate the DNSKEY
 			using the parents DS RRset. [RT #15649]
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 593427b843f..6385ffa75d4 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.446 2005/11/30 03:33:49 marka Exp $ */
+/* $Id: zone.c,v 1.447 2006/01/03 05:26:29 marka Exp $ */
 
 /*! \file */
 
@@ -1777,14 +1777,12 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 	dns_zone_log(zone, ISC_LOG_DEBUG(2),
 		     "number of nodes in database: %u",
 		     dns_db_nodecount(db));
-	zone->loadtime = loadtime;
-
-	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
 
 	if (result == DNS_R_SEENINCLUDE)
 		DNS_ZONE_SETFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
 	else
 		DNS_ZONE_CLRFLAG(zone, DNS_ZONEFLG_HASINCLUDE);
+
 	/*
 	 * Apply update log, if any, on initial load.
 	 */
@@ -1816,6 +1814,10 @@ zone_postload(dns_zone_t *zone, dns_db_t *db, isc_time_t loadtime,
 			needdump = ISC_TRUE;
 	}
 
+	zone->loadtime = loadtime;
+
+	dns_zone_log(zone, ISC_LOG_DEBUG(1), "loaded");
+
 	/*
 	 * Obtain ns, soa and cname counts for top of zone.
 	 */