From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Tue, 12 Dec 2023 16:37:30 +0000 (+0100)
Subject: lib/defines.h: Remove ITI_AGING
X-Git-Tag: 4.14.6~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25fd8eb4042fa59d6fcce19fc5288df03d8018ea;p=thirdparty%2Fshadow.git

lib/defines.h: Remove ITI_AGING

ITI_AGING is not set through any build environment. If it would be set,
then timings in /etc/shadow would not fit anymore.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Cherry-picked-from: ab260fcd1f6f ("lib/defines.h: Remove ITI_AGING")
Link: <https://github.com/shadow-maint/shadow/pull/873>
Link: <https://github.com/shadow-maint/shadow/pull/876>
Cc: "Serge E. Hallyn" <serge@hallyn.com>
[alx: This is a pre-requisite for 674409e2265e ("lib/: Saturate addition to avoid overflow")]
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/defines.h b/lib/defines.h
index b289a72df..00f3da728 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -163,11 +163,7 @@ static inline void memzero(void *ptr, size_t size)
 
 #define WEEK (7*DAY)
 
-#ifdef ITI_AGING
-#define SCALE 1
-#else
 #define SCALE DAY
-#endif
 
 #define WIDTHOF(x)   (sizeof(x) * CHAR_BIT)
 #define NITEMS(arr)  (sizeof((arr)) / sizeof((arr)[0]))