From: Mark Andrews <marka@isc.org>
Date: Mon, 26 Feb 2007 00:42:21 +0000 (+0000)
Subject: 2140.   [bug]           Handle master files with a modification time that
X-Git-Tag: v9.5.0a2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7228a4d9ca1f1b868e257a28de86c6a1f21e9ffe;p=thirdparty%2Fbind9.git

2140.   [bug]           Handle master files with a modification time that
                        matches the epoch. [RT# 16612]
---

diff --git a/CHANGES b/CHANGES
index 60d21bd3b34..00c05897dff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2140.	[bug]		Handle master files with a modification time that
+			matches the epoch. [RT# 16612]
+
 2141.	[bug]		dig/host should not be setting IDN_ASCCHECK (IDN
 			equivalent of LDH checks).  [RT #16609]
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index fee509f50a8..2da1bdb88a8 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.461 2006/12/21 06:02:30 marka Exp $ */
+/* $Id: zone.c,v 1.462 2007/02/26 00:42:21 marka Exp $ */
 
 /*! \file */
 
@@ -1214,7 +1214,8 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
 
 		result = isc_file_getmodtime(zone->masterfile, &filetime);
 		if (result == ISC_R_SUCCESS) {
-			if (!DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HASINCLUDE) &&
+			if (DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) &&
+			    !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_HASINCLUDE) &&
 			    isc_time_compare(&filetime, &zone->loadtime) <= 0) {
 				dns_zone_log(zone, ISC_LOG_DEBUG(1),
 					     "skipping load: master file "