2142. [bug] Handle master files with a modification time that

                        matches the epoch. [RT# 16612]

diff --git a/CHANGES b/CHANGES
index 7595c87641bfc46793c69741f0ff67ab89773db4..cdf19ed026914a4ce77723fb97f431221a1ee904 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2142.  [bug]           Handle master files with a modification time that
+                       matches the epoch. [RT# 16612]
+
 2140.  [bug]           libbind: missing unlock on pthread_key_create()
                        failures. [RT #16654]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index c9e8103f0b3bb7ab04474bdbd9c0d5a5ce2e3eb5..3c18f9d3351935d468ce113fe882fe648ff17674 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.333.2.23.2.67 2006/12/07 06:21:45 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.23.2.68 2007/02/26 00:50:19 marka Exp $ */
 
 #include <config.h>
 
@@ -997,6 +997,7 @@ zone_load(dns_zone_t *zone, unsigned int flags) {
                        result = isc_file_getmodtime(zone->masterfile,
                                                     &filetime);
                        if (result == ISC_R_SUCCESS &&
+                           DNS_ZONE_FLAG(zone, DNS_ZONEFLG_LOADED) &&
                            isc_time_compare(&filetime, &zone->loadtime) <= 0) {
                                dns_zone_log(zone, ISC_LOG_DEBUG(1),
                                             "skipping load: master file older "