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

Assume RLIMIT_DATA 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 22f850431..121a10029 100644
--- a/libmisc/limits.c
+++ b/libmisc/limits.c
@@ -249,13 +249,11 @@ static int do_user_limits (const char *buf, const char *name)
 			/* RLIMIT_CORE - max core file size (KB) */
 			retval |= setrlimit_value (RLIMIT_CORE, pp, 1024);
 			break;
-#ifdef RLIMIT_DATA
 		case 'd':
 		case 'D':
 			/* RLIMIT_DATA - max data size (KB) */
 			retval |= setrlimit_value (RLIMIT_DATA, pp, 1024);
 			break;
-#endif
 #ifdef RLIMIT_FSIZE
 		case 'f':
 		case 'F':
diff --git a/libmisc/pwd_init.c b/libmisc/pwd_init.c
index b8980c701..2f69083ce 100644
--- a/libmisc/pwd_init.c
+++ b/libmisc/pwd_init.c
@@ -35,9 +35,7 @@ void pwd_init (void)
 	setrlimit (RLIMIT_AS, &rlim);
 
 	setrlimit (RLIMIT_CPU, &rlim);
-#ifdef RLIMIT_DATA
 	setrlimit (RLIMIT_DATA, &rlim);
-#endif
 #ifdef RLIMIT_FSIZE
 	setrlimit (RLIMIT_FSIZE, &rlim);
 #endif