# HG changeset patch
# User Roy Marples <roy@marples.name>
# Date 1599357709 -3600
# Node ID a069d919d44c4d33779f64cd4cdaf257c5fe1713
# Parent  ff7c7b4799b3ec9781fe6684c51e4b358f2ea0cf
FreeBSD: Don't rights limit stderr

Otherwise some utils in scripts will error with insufficient
capabilities.

diff -r ff7c7b4799b3 -r a069d919d44c src/dhcpcd.c
--- a/src/dhcpcd.c	Sun Sep 06 02:41:08 2020 +0100
+++ b/src/dhcpcd.c	Sun Sep 06 03:01:49 2020 +0100
@@ -2261,17 +2261,20 @@
 		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 @@
 #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;
 	}