From: Roy Marples Date: Thu, 28 Jan 2021 12:13:45 +0000 (+0000) Subject: privsep: Don't add 1 to max fd open when limiting resources X-Git-Tag: v10.0.0~139 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62cb1ffc5096f64b7e06dab1202fdead4e85deeb;p=thirdparty%2Fdhcpcd.git privsep: Don't add 1 to max fd open when limiting resources It shoud no longer be needed for OpenBSD, Linux and Solaris. --- diff --git a/src/privsep.c b/src/privsep.c index 6dde4a1b..fb77bd27 100644 --- a/src/privsep.c +++ b/src/privsep.c @@ -148,13 +148,12 @@ ps_dropprivs(struct dhcpcd_ctx *ctx) */ unsigned long maxfd; maxfd = (unsigned long)eloop_event_count(ctx->eloop); - if (IN_PRIVSEP_SE(ctx)) - maxfd++; /* XXX why? */ struct rlimit rmaxfd = { .rlim_cur = maxfd, .rlim_max = maxfd }; + if (setrlimit(RLIMIT_NOFILE, &rmaxfd) == -1) logerr("setrlimit RLIMIT_NOFILE"); #else