Mercurial > hg > dhcpcd
changeset 5313:9aa7c5f01a8b draft
OpenBSD: disable setting resource limits as we have pledge.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Fri, 05 Jun 2020 13:02:32 +0100 |
| parents | b336a280de82 |
| children | 11e07bba68c3 |
| files | src/if.c src/privsep.c |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if.c Fri Jun 05 12:24:44 2020 +0100 +++ b/src/if.c Fri Jun 05 13:02:32 2020 +0100 @@ -107,7 +107,7 @@ if (if_opensockets_os(ctx) == -1) return -1; -#ifdef PF_LINK +#ifdef IFLR_ACTIVE ctx->pf_link_fd = xsocket(PF_LINK, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (ctx->pf_link_fd == -1) return -1;
--- a/src/privsep.c Fri Jun 05 12:24:44 2020 +0100 +++ b/src/privsep.c Fri Jun 05 13:02:32 2020 +0100 @@ -113,7 +113,9 @@ ps_dropprivs(struct dhcpcd_ctx *ctx) { struct passwd *pw = ctx->ps_user; +#ifndef HAVE_PLEDGE struct rlimit rzero = { .rlim_cur = 0, .rlim_max = 0 }; +#endif if (!(ctx->options & DHCPCD_FORKED)) logdebugx("chrooting to `%s' as %s", pw->pw_dir, pw->pw_name); @@ -130,6 +132,7 @@ return -1; } +#ifndef HAVE_PLEDGE /* Prohibit new files, sockets, etc */ if (setrlimit(RLIMIT_NOFILE, &rzero) == -1) { logerr("setrlimit RLIMIT_NOFILE"); @@ -149,6 +152,7 @@ return -1; } #endif +#endif return 0; }