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

                        matches the epoch. [RT# 16612]

diff --git a/CHANGES b/CHANGES
index 64e6ae23a110485f38cd4c68d0ffd62e464964be..1fd40e54fd13e2cadf8402cdaa84db1fda293754 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 6513e77bf18fb030b13f650e3bf8e23949810229..444951a9a7eef5877643c6bdc15af0bbd7e2eb48 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.46 2006/12/07 06:21:15 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.47 2007/02/26 00:50:13 marka Exp $ */
 
 #include <config.h>
 
@@ -945,6 +945,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 "