]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
Assume RLIMIT_DATA is defined
authorAlejandro Colomar <alx@kernel.org>
Fri, 2 Dec 2022 21:53:45 +0000 (22:53 +0100)
committerSerge Hallyn <serge@hallyn.com>
Thu, 15 Dec 2022 22:22:05 +0000 (16:22 -0600)
It is required by POSIX.1-2001.

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

index 22f8504318020162271b13f690f88000eb50f796..121a10029be33d0c2c694d3ac5841d3a67daf37a 100644 (file)
@@ -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':
index b8980c701f69f7afc6cd5b573fef85c7beaeec46..2f69083ced4c0c59e5b699e7bb204e5c419a0c39 100644 (file)
@@ -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