From: Roy Marples <roy@marples.name>
Date: Mon, 3 Aug 2020 16:04:51 +0000 (+0100)
Subject: Revert "privsep: shutdown read end of the write only sockets"
X-Git-Tag: v9.2.0~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a73da9ef56fa7292b6142d05aea17cf478dc63cc;p=thirdparty%2Fdhcpcd.git

Revert "privsep: shutdown read end of the write only sockets"

Fails noisly on Linux.

This reverts commit 5fc20ae1aa368e36f9cabcbc047cd7d8e468c5b7.
---

diff --git a/src/privsep-root.c b/src/privsep-root.c
index 8c642e70..f1b40745 100644
--- a/src/privsep-root.c
+++ b/src/privsep-root.c
@@ -635,7 +635,7 @@ ps_root_startcb(void *arg)
 	ctx->ps_root_pid = getpid();
 	ctx->options |= DHCPCD_PRIVSEPROOT;
 
-	/* Open network sockets for sending only.
+	/* Open network sockets for sending.
 	 * This is a small bit wasteful for non sandboxed OS's
 	 * but makes life very easy for unicasting DHCPv6 in non master
 	 * mode as we no longer care about address selection. */
@@ -645,8 +645,6 @@ ps_root_startcb(void *arg)
 		    SOCK_RAW | SOCK_CXNB, IPPROTO_UDP);
 		if (ctx->udp_wfd == -1)
 			logerr("%s: dhcp_openraw", __func__);
-		else if (shutdown(ctx->udp_wfd, SHUT_RD) == -1)
-			logerr("%s: shutdown dhcp", __func__);
 	}
 #endif
 #ifdef INET6
@@ -654,8 +652,6 @@ ps_root_startcb(void *arg)
 		ctx->nd_fd = ipv6nd_open(false);
 		if (ctx->nd_fd == -1)
 			logerr("%s: ipv6nd_open", __func__);
-		else if (shutdown(ctx->nd_fd, SHUT_RD) == -1)
-			logerr("%s: shutdown nd", __func__);
 	}
 #endif
 #ifdef DHCP6
@@ -663,8 +659,6 @@ ps_root_startcb(void *arg)
 		ctx->dhcp6_wfd = dhcp6_openraw();
 		if (ctx->dhcp6_wfd == -1)
 			logerr("%s: dhcp6_openraw", __func__);
-		else if (shutdown(ctx->dhcp6_wfd, SHUT_RD) == -1)
-			logerr("%s: shutdown dhcp6", __func__);
 	}
 #endif