From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 4 Dec 2023 02:00:34 +0000 (+1300)
Subject: s4:dsdb: Use portable integer constant INT64_MAX
X-Git-Tag: talloc-2.4.2~385
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1dc284fed25639508c5ae1598ce95241e7bfaf8;p=thirdparty%2Fsamba.git

s4:dsdb: Use portable integer constant INT64_MAX

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 625e676165b..1317b58874c 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -756,7 +756,7 @@ static NTTIME get_msds_user_password_expiry_time_computed(struct ldb_module *mod
 					"userAccountControl",
 					0);
 	if (userAccountControl & _UF_NO_EXPIRY_ACCOUNTS) {
-		return 0x7FFFFFFFFFFFFFFFULL;
+		return INT64_MAX;
 	}
 
 	pwdLastSet = ldb_msg_find_attr_as_int64(msg, "pwdLastSet", 0);
@@ -768,14 +768,14 @@ static NTTIME get_msds_user_password_expiry_time_computed(struct ldb_module *mod
 		/*
 		 * This can't really happen...
 		 */
-		return 0x7FFFFFFFFFFFFFFFULL;
+		return INT64_MAX;
 	}
 
-	if (pwdLastSet >= 0x7FFFFFFFFFFFFFFFLL) {
+	if (pwdLastSet >= INT64_MAX) {
 		/*
 		 * Somethings wrong with the clock...
 		 */
-		return 0x7FFFFFFFFFFFFFFFULL;
+		return INT64_MAX;
 	}
 
 	/*
@@ -793,21 +793,21 @@ static NTTIME get_msds_user_password_expiry_time_computed(struct ldb_module *mod
 		/*
 		 * This is not really possible...
 		 */
-		return 0x7FFFFFFFFFFFFFFFULL;
+		return INT64_MAX;
 	}
 
 	if (maxPwdAge == INT64_MIN) {
-		return 0x7FFFFFFFFFFFFFFFULL;
+		return INT64_MAX;
 	}
 
 	/*
 	 * Note we already caught maxPwdAge == INT64_MIN
-	 * and pwdLastSet >= 0x7FFFFFFFFFFFFFFFULL above.
+	 * and pwdLastSet >= INT64_MAX above.
 	 *
 	 * Remember maxPwdAge is a negative number,
 	 * so it results in the following.
 	 *
-	 * 0x7FFFFFFFFFFFFFFEULL + 0x7FFFFFFFFFFFFFFFULL
+	 * 0x7FFFFFFFFFFFFFFEULL + INT64_MAX
 	 * =
 	 * 0xFFFFFFFFFFFFFFFDULL
 	 *
@@ -815,8 +815,8 @@ static NTTIME get_msds_user_password_expiry_time_computed(struct ldb_module *mod
 	 * ever be more than 1<<64, therefore this result can't wrap.
 	 */
 	ret = (NTTIME)pwdLastSet - (NTTIME)maxPwdAge;
-	if (ret >= 0x7FFFFFFFFFFFFFFFULL) {
-		return 0x7FFFFFFFFFFFFFFFULL;
+	if (ret >= INT64_MAX) {
+		return INT64_MAX;
 	}
 
 	return ret;