From: Alejandro Colomar <alx@kernel.org>
Date: Fri, 2 Dec 2022 21:51:41 +0000 (+0100)
Subject: Assume RLIMIT_AS is defined
X-Git-Tag: 4.14.0-rc1~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a4906fc753a5b6f26bbe952f3846fe741a440ef;p=thirdparty%2Fshadow.git

Assume RLIMIT_AS is defined

It is required by POSIX.1-2001.

Cc: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/libmisc/limits.c b/libmisc/limits.c
index 846dd54a8..bdee60a67 100644
--- a/libmisc/limits.c
+++ b/libmisc/limits.c
@@ -239,13 +239,11 @@ static int do_user_limits (const char *buf, const char *name)
 
 	while ('\0' != *pp) {
 		switch (*pp++) {
-#ifdef RLIMIT_AS
 		case 'a':
 		case 'A':
 			/* RLIMIT_AS - max address space (KB) */
 			retval |= setrlimit_value (RLIMIT_AS, pp, 1024);
 			break;
-#endif
 		case 'c':
 		case 'C':
 			/* RLIMIT_CORE - max core file size (KB) */
diff --git a/libmisc/pwd_init.c b/libmisc/pwd_init.c
index eb2bddf1c..439361ac1 100644
--- a/libmisc/pwd_init.c
+++ b/libmisc/pwd_init.c
@@ -32,9 +32,8 @@ void pwd_init (void)
 	setrlimit (RLIMIT_CORE, &rlim);
 
 	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
-#ifdef RLIMIT_AS
 	setrlimit (RLIMIT_AS, &rlim);
-#endif
+
 #ifdef RLIMIT_CPU
 	setrlimit (RLIMIT_CPU, &rlim);
 #endif