]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
Assume RLIMIT_CPU is defined
authorAlejandro Colomar <alx@kernel.org>
Fri, 2 Dec 2022 21:52:52 +0000 (22:52 +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 bdee60a6766a34af4f0bf73dc2d6104d58289648..22f8504318020162271b13f690f88000eb50f796 100644 (file)
@@ -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':
index 439361ac11ab8e24644fb6eff150e032511fdda1..b8980c701f69f7afc6cd5b573fef85c7beaeec46 100644 (file)
@@ -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