From: Roy Marples <roy@marples.name>
Date: Thu, 4 Jun 2020 11:31:24 +0000 (+0100)
Subject: privsep: Log ECONNRESET errors again
X-Git-Tag: v9.1.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a18fcc42fe36b732393bd48753bd3dd8f49ddcb0;p=thirdparty%2Fdhcpcd.git

privsep: Log ECONNRESET errors again

Now that we've improved the robustness of the IPC this is important.
---

diff --git a/src/privsep-bpf.c b/src/privsep-bpf.c
index e1fd8bc7..6189349d 100644
--- a/src/privsep-bpf.c
+++ b/src/privsep-bpf.c
@@ -82,7 +82,7 @@ ps_bpf_recvbpf(void *arg)
 		psm.ps_flags = bpf->bpf_flags;
 		len = ps_sendpsmdata(psp->psp_ctx, psp->psp_ctx->ps_data_fd,
 		    &psm, buf, (size_t)len);
-		if (len == -1 && errno != ECONNRESET)
+		if (len == -1)
 			logerr(__func__);
 		if (len == -1 || len == 0)
 			break;
diff --git a/src/privsep-root.c b/src/privsep-root.c
index 2a45abb9..fdf43856 100644
--- a/src/privsep-root.c
+++ b/src/privsep-root.c
@@ -596,8 +596,7 @@ ps_root_recvmsg(void *arg)
 {
 	struct dhcpcd_ctx *ctx = arg;
 
-	if (ps_recvpsmsg(ctx, ctx->ps_root_fd, ps_root_recvmsgcb, ctx) == -1 &&
-	    errno != ECONNRESET)
+	if (ps_recvpsmsg(ctx, ctx->ps_root_fd, ps_root_recvmsgcb, ctx) == -1)
 		logerr(__func__);
 }