Mercurial > hg > dhcpcd

changeset 5417:96a086beb655 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert "privsep: shutdown read end of the write only sockets" Fails noisly on Linux. This reverts commit 5fc20ae1aa368e36f9cabcbc047cd7d8e468c5b7.
author Roy Marples <roy@marples.name>
date Mon, 03 Aug 2020 17:04:51 +0100
parents 1290c8e7ea84
children a295302f7de1
files src/privsep-root.c
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/privsep-root.c	Mon Aug 03 16:56:14 2020 +0100
+++ b/src/privsep-root.c	Mon Aug 03 17:04:51 2020 +0100
@@ -635,7 +635,7 @@
 	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 @@
 		    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 @@
 		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 @@
 		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