From: Mark Andrews <marka@isc.org>
Date: Mon, 20 Feb 2017 05:57:09 +0000 (+1100)
Subject: explictly cast to isc_stdtime_t
X-Git-Tag: v9.9.10rc2~13
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=31099ddd3cc6c285ed0008312333f68199eca408;p=thirdparty%2Fbind9.git

explictly cast to isc_stdtime_t

(cherry picked from commit 9998a15284db9b1f289356d956d247e0359dc084)
---

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 66a0c8a6612..6b0c5a3f9f4 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -6762,8 +6762,8 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 
 		if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
 			newheader->attributes |= RDATASET_ATTR_RESIGN;
-			newheader->resign =
-				    dns_time64_from32(rdataset->resign) >> 1;
+			newheader->resign = (isc_stdtime_t)
+				(dns_time64_from32(rdataset->resign) >> 1);
 			newheader->resign_lsb = rdataset->resign & 0x1;
 		} else {
 			newheader->resign = 0;
@@ -6948,7 +6948,8 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
 	newheader->node = rbtnode;
 	if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
 		newheader->attributes |= RDATASET_ATTR_RESIGN;
-		newheader->resign = dns_time64_from32(rdataset->resign) >> 1;
+		newheader->resign = (isc_stdtime_t)
+			(dns_time64_from32(rdataset->resign) >> 1);
 		newheader->resign_lsb = rdataset->resign & 0x1;
 	} else {
 		newheader->resign = 0;
@@ -7336,7 +7337,8 @@ loading_addrdataset(void *arg, dns_name_t *name, dns_rdataset_t *rdataset) {
 	newheader->node = node;
 	if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
 		newheader->attributes |= RDATASET_ATTR_RESIGN;
-		newheader->resign = dns_time64_from32(rdataset->resign) >> 1;
+		newheader->resign = (isc_stdtime_t)
+			(dns_time64_from32(rdataset->resign) >> 1);
 		newheader->resign_lsb = rdataset->resign & 0x1;
 	} else {
 		newheader->resign = 0;
@@ -7642,7 +7644,7 @@ setsigningtime(dns_db_t *db, dns_rdataset_t *rdataset, isc_stdtime_t resign) {
 		  isc_rwlocktype_write);
 
 	oldresign = header->resign;
-	header->resign = dns_time64_from32(resign) >> 1;
+	header->resign = (isc_stdtime_t)(dns_time64_from32(resign) >> 1);
 	header->resign_lsb = resign & 0x1;
 	if (header->heap_index != 0) {
 		INSIST(RESIGN(header));