From: Mark Andrews <marka@isc.org>
Date: Fri, 4 Jun 2004 02:41:39 +0000 (+0000)
Subject: 1644.   [bug]           Update the journal modification time after a
X-Git-Tag: v9.2.3rc4^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fcb35a9d205902b741ffa463fb9be6b4a3b21d9;p=thirdparty%2Fbind9.git

1644.   [bug]           Update the journal modification time after a
                        sucessfull refresh query. [RT #11436]
---

diff --git a/CHANGES b/CHANGES
index 72421c017c4..d42a0843616 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 1646.	[bug]		win32: logging file versions didn't work with
 			non-UNC filenames.  [RT#11486]
 
+1644.	[bug]		Update the journal modification time after a
+			sucessfull refresh query. [RT #11436]
+
 1643.	[bug]		dns_db_closeversion() could leak memory / node
 			references. [RT #11163]
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 35a1e43c26d..10d4a0253a5 100644
--- 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.32 2004/04/28 04:23:34 marka Exp $ */
+/* $Id: zone.c,v 1.333.2.33 2004/06/04 02:41:39 marka Exp $ */
 
 #include <config.h>
 
@@ -3322,7 +3322,12 @@ refresh_callback(isc_task_t *task, isc_event_t *event) {
 			dns_message_destroy(&msg);
 	} else if (isc_serial_eq(soa.serial, zone->serial)) {
 		if (zone->masterfile != NULL) {
-			result = isc_file_settime(zone->masterfile, &now);
+			result = ISC_R_FAILURE;
+			if (zone->journal != NULL)
+				result = isc_file_settime(zone->journal, &now);
+			if (result != ISC_R_SUCCESS)
+				result = isc_file_settime(zone->masterfile,
+							  &now);
 			if (result != ISC_R_SUCCESS)
 				dns_zone_log(zone, ISC_LOG_ERROR,
 					     "refresh: could not set file "