Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RLIMIT_OFILE => RLIMIT_NOFILE

Browse Source 
Do something sensible when current RLIMIT_NOFILE turns out to be infinity.
This commit is contained in:
pk 1993-12-14 21:31:53 +00:00
parent 86546a593f
commit e0738ce1d3
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.sbin/inetd/inetd.c
View File

@ -39,7 +39,7 @@ char copyright[] =
#ifndef lint #ifndef lint
/*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/ /*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/
static char rcsid[] = "$Id: inetd.c,v 1.5 1993/10/13 11:22:50 pk Exp $"; static char rcsid[] = "$Id: inetd.c,v 1.6 1993/12/14 21:31:53 pk Exp $";
#endif /* not lint */ #endif /* not lint */
/* /*
@ -120,8 +120,8 @@ static char rcsid[] = "$Id: inetd.c,v 1.5 1993/10/13 11:22:50 pk Exp $";
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
#ifdef RLIMIT_NOFILE /* Sun */ #ifndef RLIMIT_NOFILE
#define RLIMIT_OFILE RLIMIT_NOFILE #define RLIMIT_NOFILE RLIMIT_OFILE
#endif #endif
#define RPC #define RPC
@ -178,7 +178,7 @@ char *curdom;
#define FD_MARGIN (8) #define FD_MARGIN (8)
int rlim_ofile_cur = OPEN_MAX; int rlim_ofile_cur = OPEN_MAX;
#ifdef RLIMIT_OFILE #ifdef RLIMIT_NOFILE
struct rlimit rlim_ofile; struct rlimit rlim_ofile;
#endif #endif
@ -316,11 +316,13 @@ main(argc, argv, envp)
openlog(progname, LOG_PID | LOG_NOWAIT, LOG_DAEMON); openlog(progname, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
logpid(); logpid();
#ifdef RLIMIT_OFILE #ifdef RLIMIT_NOFILE
if (getrlimit(RLIMIT_OFILE, &rlim_ofile) < 0) { if (getrlimit(RLIMIT_NOFILE, &rlim_ofile) < 0) {
syslog(LOG_ERR, "getrlimit: %m"); syslog(LOG_ERR, "getrlimit: %m");
} else { } else {
rlim_ofile_cur = rlim_ofile.rlim_cur; rlim_ofile_cur = rlim_ofile.rlim_cur;
if (rlim_ofile_cur == RLIM_INFINITY) /* ! */
rlim_ofile_cur = OPEN_MAX;
} }
#endif #endif
@ -477,9 +479,9 @@ main(argc, argv, envp)
close(ctrl); close(ctrl);
dup2(0, 1); dup2(0, 1);
dup2(0, 2); dup2(0, 2);
#ifdef RLIMIT_OFILE #ifdef RLIMIT_NOFILE
if (rlim_ofile.rlim_cur != rlim_ofile_cur) { if (rlim_ofile.rlim_cur != rlim_ofile_cur) {
if (setrlimit(RLIMIT_OFILE, if (setrlimit(RLIMIT_NOFILE,
&rlim_ofile) < 0) &rlim_ofile) < 0)
syslog(LOG_ERR,"setrlimit: %m"); syslog(LOG_ERR,"setrlimit: %m");
} }
@ -1145,13 +1147,13 @@ logpid()
bump_nofile() bump_nofile()
{ {
#ifdef RLIMIT_OFILE #ifdef RLIMIT_NOFILE
#define FD_CHUNK 32 #define FD_CHUNK 32
struct rlimit rl; struct rlimit rl;
if (getrlimit(RLIMIT_OFILE, &rl) < 0) { if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
syslog(LOG_ERR, "getrlimit: %m"); syslog(LOG_ERR, "getrlimit: %m");
return -1; return -1;
} }
@ -1163,7 +1165,7 @@ bump_nofile()
return -1; return -1;
} }
if (setrlimit(RLIMIT_OFILE, &rl) < 0) { if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
syslog(LOG_ERR, "setrlimit: %m"); syslog(LOG_ERR, "setrlimit: %m");
return -1; return -1;
} }