From e94754428d472bdde2cba0efdd549bac2e87b98b Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 22 Nov 2004 23:52:25 +0000 Subject: [PATCH] 1766. [bug] Update the master file timestamp on successful refresh as well as the journal's timestamp. [RT# 13062] --- CHANGES | 3 ++- lib/dns/zone.c | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 5729812482..7a4240a3d2 100644 --- a/CHANGES +++ b/CHANGES @@ -14,7 +14,8 @@ 1767. [port] Builds on IPv6 platforms without IPv6 Advanced API support for (struct in6_pktinfo) failed. [RT #13077] -1766. [placeholder] rt13062 +1766. [bug] Update the master file timestamp on successful refresh + as well as the journal's timestamp. [RT# 13062] 1765. [bug] configure --with-openssl=auto failed. [RT #12937] diff --git a/lib/dns/zone.c b/lib/dns/zone.c index b71912268c..7c4e59f7ab 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.423 2004/11/09 22:16:57 marka Exp $ */ +/* $Id: zone.c,v 1.424 2004/11/22 23:52:25 marka Exp $ */ #include @@ -3644,7 +3644,12 @@ refresh_callback(isc_task_t *task, isc_event_t *event) { result = ISC_R_FAILURE; if (zone->journal != NULL) result = isc_file_settime(zone->journal, &now); - if (result != ISC_R_SUCCESS) + if (result == ISC_R_SUCCESS && + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_NEEDDUMP) && + !DNS_ZONE_FLAG(zone, DNS_ZONEFLG_DUMPING)) { + result = isc_file_settime(zone->masterfile, + &now); + } else if (result != ISC_R_SUCCESS) result = isc_file_settime(zone->masterfile, &now); /* Someone removed the file from underneath us! */