From: Roy Marples <roy@marples.name>
Date: Sun, 6 Sep 2020 02:01:49 +0000 (+0100)
Subject: FreeBSD: Don't rights limit stderr
X-Git-Tag: v9.2.0~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc2150dce5fa055b44816d4c6b9ca16f7a7df4b;p=thirdparty%2Fdhcpcd.git

FreeBSD: Don't rights limit stderr

Otherwise some utils in scripts will error with insufficient
capabilities.
---

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index d5d67f64..9c47ca7c 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -2261,17 +2261,20 @@ printpidfile:
 		ctx.fork_fd = fork_fd[1];
 		close(fork_fd[0]);
 #ifdef PRIVSEP_RIGHTS
-		if (ps_rights_limit_fd(fork_fd[1]) == -1 ||
-		    ps_rights_limit_fd(stderr_fd[1]) == 1)
-		{
+		if (ps_rights_limit_fd(fork_fd[1]) == -1) {
 			logerr("ps_rights_limit_fdpair");
 			goto exit_failure;
 		}
 #endif
-		/* Redirect stderr to the stderr socketpair.
+		/*
+		 * Redirect stderr to the stderr socketpair.
 		 * Redirect stdout as well.
 		 * dhcpcd doesn't output via stdout, but something in
-		 * a called script might. */
+		 * a called script might.
+		 *
+		 * Do NOT rights limit this fd as it will affect scripts.
+		 * For example, cmp reports insufficient caps on FreeBSD.
+		 */
 		if (dup2(stderr_fd[1], STDERR_FILENO) == -1 ||
 		    dup2(stderr_fd[1], STDOUT_FILENO) == -1)
 			logerr("dup2");
@@ -2310,7 +2313,8 @@ printpidfile:
 #endif
 		setproctitle("[launcher]");
 		eloop_event_add(ctx.eloop, ctx.fork_fd, dhcpcd_fork_cb, &ctx);
-		eloop_event_add(ctx.eloop, ctx.stderr_fd, dhcpcd_stderr_cb, &ctx);
+		eloop_event_add(ctx.eloop, ctx.stderr_fd, dhcpcd_stderr_cb,
+		    &ctx);
 		goto run_loop;
 	}