From: Mark Andrews <marka@isc.org>
Date: Wed, 18 May 2016 02:39:50 +0000 (+1000)
Subject: 4367.   [bug]           Remove unnecessary assignment of loadtime in
X-Git-Tag: v9.11.0a2~8
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=049a49c2956dd9cc9b82974e2bbe77c57fcc73db;p=thirdparty%2Fbind9.git

4367.   [bug]           Remove unnecessary assignment of loadtime in
                        zone_touched. [RT #42440]
---

diff --git a/CHANGES b/CHANGES
index 846053f999b..7b62f7a3062 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 	--- 9.11.0a1 released ---
 
+4367.	[bug]		Remove unnecessary assignment of loadtime in
+			zone_touched. [RT #42440]
+
 4366.	[bug]		Address race condition when updating rbtnode bit
 			fields. [RT #42379]
 
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index cd5599802db..b09df67e62b 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1759,10 +1759,7 @@ zone_touched(dns_zone_t *zone) {
 	result = isc_file_getmodtime(zone->masterfile, &modtime);
 	if (result != ISC_R_SUCCESS ||
 	    isc_time_compare(&modtime, &zone->loadtime) > 0)
-	{
-		zone->loadtime = modtime;
 		return (ISC_TRUE);
-	}
 
 	for (include = ISC_LIST_HEAD(zone->includes);
 	     include != NULL;