972. [bug] The file modification time code in zone.c was using the

                        wrong epoch.  [RT #1667]

diff --git a/CHANGES b/CHANGES
index 1b0f5a6282dadedb4d47ac2064e5408be6674ef4..fb5247d8787120820712278587798e5451fd11bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 972.  [bug]           The file modification time code in zone.c was using the
+                       wrong epoch.  [RT #1667]
+
  971.  [func]          'try-edns' can be use to disable edns on all queries.
 
  970.  [func]          'journal-size' can now be used to set a target

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 2293975ec6f40bfb0a537ea21d55852c8a36d64b..1f1fc3ce507f10a74fbf310c6f7ae88754ac6a24 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.334 2001/08/30 05:24:44 marka Exp $ */
+/* $Id: zone.c,v 1.335 2001/08/30 06:48:43 marka Exp $ */
 
 #include <config.h>
 
@@ -3314,7 +3314,7 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
        } else if (isc_serial_eq(soa.serial, zone->serial)) {
                if (zone->masterfile != NULL) {
                        isc_time_t t;
-                       isc_time_set(&t, now, 0);
+                       (void)isc_time_now(&t);
                        result = isc_file_settime(zone->masterfile, &t);
                        if (result != ISC_R_SUCCESS)
                                dns_zone_log(zone, ISC_LOG_ERROR,
@@ -3851,7 +3851,7 @@ zone_settimer(dns_zone_t *zone, isc_stdtime_t now) {
        } else {
                if (next <= now) {
                        next = now;
-                       isc_time_now(&expires);
+                       (void)isc_time_now(&expires);
                        isc_interval_set(&interval, 0, 0);
                } else {
                        isc_time_settoepoch(&expires);
@@ -4750,7 +4750,8 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) {
                 */
                if (zone->masterfile != NULL || zone->journal != NULL) {
                        isc_time_t t;
-                       isc_time_set(&t, now, 0);
+
+                       (void)isc_time_now(&t);
 
                        result = ISC_R_FAILURE;
                        if (zone->journal != NULL)