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

Assume RLIMIT_CPU 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 bdee60a67..22f850431 100644
--- a/libmisc/limits.c
+++ b/libmisc/limits.c
@@ -318,13 +318,11 @@ static int do_user_limits (const char *buf, const char *name)
 			retval |= setrlimit_value (RLIMIT_STACK, pp, 1024);
 			break;
 #endif
-#ifdef RLIMIT_CPU
 		case 't':
 		case 'T':
 			/* RLIMIT_CPU - max CPU time (MIN) */
 			retval |= setrlimit_value (RLIMIT_CPU, pp, 60);
 			break;
-#endif
 #ifdef RLIMIT_NPROC
 		case 'u':
 		case 'U':
diff --git a/libmisc/pwd_init.c b/libmisc/pwd_init.c
index 439361ac1..b8980c701 100644
--- a/libmisc/pwd_init.c
+++ b/libmisc/pwd_init.c
@@ -34,9 +34,7 @@ void pwd_init (void)
 	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
 	setrlimit (RLIMIT_AS, &rlim);
 
-#ifdef RLIMIT_CPU
 	setrlimit (RLIMIT_CPU, &rlim);
-#endif
 #ifdef RLIMIT_DATA
 	setrlimit (RLIMIT_DATA, &rlim);
 #endif