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

Assume RLIMIT_NOFILE 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 c6f4fa484..81b56b645 100644
--- a/libmisc/limits.c
+++ b/libmisc/limits.c
@@ -282,13 +282,11 @@ static int do_user_limits (const char *buf, const char *name)
 			retval |= setrlimit_value (RLIMIT_MEMLOCK, pp, 1024);
 			break;
 #endif
-#ifdef RLIMIT_NOFILE
 		case 'n':
 		case 'N':
 			/* RLIMIT_NOFILE - max number of open files */
 			retval |= setrlimit_value (RLIMIT_NOFILE, pp, 1);
 			break;
-#endif
 #ifdef RLIMIT_RTPRIO
 		case 'o':
 		case 'O':
diff --git a/libmisc/pwd_init.c b/libmisc/pwd_init.c
index 70453d2df..c7cffba34 100644
--- a/libmisc/pwd_init.c
+++ b/libmisc/pwd_init.c
@@ -37,9 +37,7 @@ void pwd_init (void)
 	setrlimit (RLIMIT_CPU, &rlim);
 	setrlimit (RLIMIT_DATA, &rlim);
 	setrlimit (RLIMIT_FSIZE, &rlim);
-#ifdef RLIMIT_NOFILE
 	setrlimit (RLIMIT_NOFILE, &rlim);
-#endif
 #ifdef RLIMIT_RSS
 	setrlimit (RLIMIT_RSS, &rlim);
 #endif