]> git.ipfire.org Git - thirdparty/shadow.git/commitdiff
Assume RLIMIT_FSIZE is defined
authorAlejandro Colomar <alx@kernel.org>
Fri, 2 Dec 2022 21:55:18 +0000 (22:55 +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
libmisc/ulimit.c

index 121a10029be33d0c2c694d3ac5841d3a67daf37a..c6f4fa48424d6875e3e2f721aa6a830c064e01c4 100644 (file)
@@ -254,13 +254,11 @@ static int do_user_limits (const char *buf, const char *name)
                        /* RLIMIT_DATA - max data size (KB) */
                        retval |= setrlimit_value (RLIMIT_DATA, pp, 1024);
                        break;
-#ifdef RLIMIT_FSIZE
                case 'f':
                case 'F':
                        /* RLIMIT_FSIZE - Maximum filesize (KB) */
                        retval |= setrlimit_value (RLIMIT_FSIZE, pp, 1024);
                        break;
-#endif
 #ifdef RLIMIT_NICE
                case 'i':
                case 'I':
index 2f69083ced4c0c59e5b699e7bb204e5c419a0c39..70453d2df0cc33ddc63318a65e5c0d2f3f5a8eaa 100644 (file)
@@ -36,9 +36,7 @@ void pwd_init (void)
 
        setrlimit (RLIMIT_CPU, &rlim);
        setrlimit (RLIMIT_DATA, &rlim);
-#ifdef RLIMIT_FSIZE
        setrlimit (RLIMIT_FSIZE, &rlim);
-#endif
 #ifdef RLIMIT_NOFILE
        setrlimit (RLIMIT_NOFILE, &rlim);
 #endif
index 0123e040f8328322af677b433eb5e6466502a6cb..eae8b247fed283fc09425dd01737530052902f0a 100644 (file)
 int set_filesize_limit (int blocks)
 {
        int ret = -1;
-#if defined(RLIMIT_FSIZE)
        struct rlimit rlimit_fsize;
 
        rlimit_fsize.rlim_cur = 512L * blocks;
        rlimit_fsize.rlim_max = rlimit_fsize.rlim_cur;
        ret = setrlimit (RLIMIT_FSIZE, &rlimit_fsize);
-#endif
 
        return ret;
 }