emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Assume <sys/resource.h> exists

Browse Source 
It is required by POSIX.1-2001.

Cc: Christian Göttsche <cgzones@googlemail.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar 2022-12-02 22:20:55 +01:00 committed by Serge Hallyn
parent cdaa04e460
commit 9d695340b4
4 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -38,7 +38,7 @@ dnl Checks for libraries.
dnl Checks for header files. dnl Checks for header files.
AC_CHECK_HEADERS(crypt.h utmp.h \ AC_CHECK_HEADERS(crypt.h utmp.h \
termio.h sgtty.h sys/ioctl.h paths.h \ termio.h sgtty.h sys/ioctl.h paths.h \
sys/capability.h sys/random.h sys/resource.h \ sys/capability.h sys/random.h \
gshadow.h lastlog.h rpc/key_prot.h netdb.h acl/libacl.h \ gshadow.h lastlog.h rpc/key_prot.h netdb.h acl/libacl.h \
attr/libattr.h attr/error_context.h) attr/libattr.h attr/error_context.h)

2
libmisc/limits.c
View File

@ -28,10 +28,8 @@
#include <pwd.h> #include <pwd.h>
#include "getdef.h" #include "getdef.h"
#include "shadowlog.h" #include "shadowlog.h"
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h> #include <sys/resource.h>
#define LIMITS #define LIMITS
#endif
#ifdef LIMITS #ifdef LIMITS
#ifndef LIMITS_FILE #ifndef LIMITS_FILE
#define LIMITS_FILE "/etc/limits" #define LIMITS_FILE "/etc/limits"

39
libmisc/pwd_init.c
View File

@ -15,9 +15,7 @@
#include <signal.h> #include <signal.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h> #include <sys/resource.h>
#endif
#include "prototypes.h" #include "prototypes.h"
@ -28,39 +26,34 @@
*/ */
void pwd_init (void) void pwd_init (void)
{ {
#ifdef HAVE_SYS_RESOURCE_H
struct rlimit rlim; struct rlimit rlim;
# ifdef RLIMIT_CORE #ifdef RLIMIT_CORE
rlim.rlim_cur = rlim.rlim_max = 0; rlim.rlim_cur = rlim.rlim_max = 0;
setrlimit (RLIMIT_CORE, &rlim); setrlimit (RLIMIT_CORE, &rlim);
# endif #endif
rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY; rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
# ifdef RLIMIT_AS #ifdef RLIMIT_AS
setrlimit (RLIMIT_AS, &rlim); setrlimit (RLIMIT_AS, &rlim);
# endif #endif
# ifdef RLIMIT_CPU #ifdef RLIMIT_CPU
setrlimit (RLIMIT_CPU, &rlim); setrlimit (RLIMIT_CPU, &rlim);
# endif #endif
# ifdef RLIMIT_DATA #ifdef RLIMIT_DATA
setrlimit (RLIMIT_DATA, &rlim); setrlimit (RLIMIT_DATA, &rlim);
# endif #endif
# ifdef RLIMIT_FSIZE #ifdef RLIMIT_FSIZE
setrlimit (RLIMIT_FSIZE, &rlim); setrlimit (RLIMIT_FSIZE, &rlim);
# endif #endif
# ifdef RLIMIT_NOFILE #ifdef RLIMIT_NOFILE
setrlimit (RLIMIT_NOFILE, &rlim); setrlimit (RLIMIT_NOFILE, &rlim);
# endif #endif
# ifdef RLIMIT_RSS #ifdef RLIMIT_RSS
setrlimit (RLIMIT_RSS, &rlim); setrlimit (RLIMIT_RSS, &rlim);
# endif #endif
# ifdef RLIMIT_STACK #ifdef RLIMIT_STACK
setrlimit (RLIMIT_STACK, &rlim); setrlimit (RLIMIT_STACK, &rlim);
# endif #endif
#else /* !HAVE_SYS_RESOURCE_H */
set_filesize_limit (30000);
/* don't know how to set the other limits... */
#endif /* !HAVE_SYS_RESOURCE_H */
signal (SIGALRM, SIG_IGN); signal (SIGALRM, SIG_IGN);
signal (SIGHUP, SIG_IGN); signal (SIGHUP, SIG_IGN);

6
libmisc/ulimit.c
View File

@ -11,11 +11,9 @@
#ident "$Id$" #ident "$Id$"
#if HAVE_SYS_RESOURCE_H #include <sys/time.h> /* for struct timeval on sunos4 */
# include <sys/time.h> /* for struct timeval on sunos4 */
/* XXX - is the above ok or should it be <time.h> on ultrix? */ /* XXX - is the above ok or should it be <time.h> on ultrix? */
# include <sys/resource.h> #include <sys/resource.h>
#endif
#include "prototypes.h" #include "prototypes.h"
int set_filesize_limit (int blocks) int set_filesize_limit (int blocks)