From: Roy Marples <roy@marples.name>
Date: Wed, 10 Jun 2020 13:42:08 +0000 (+0100)
Subject: Fix some logic
X-Git-Tag: v9.1.2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53ad138573f73f9988f3a3b0f6eb14dc3250ed79;p=thirdparty%2Fdhcpcd.git

Fix some logic
---

diff --git a/src/privsep-control.c b/src/privsep-control.c
index ba8dff09..619171f8 100644
--- a/src/privsep-control.c
+++ b/src/privsep-control.c
@@ -255,7 +255,9 @@ ps_ctl_start(struct dhcpcd_ctx *ctx)
 	    ps_ctl_startcb, ps_ctl_signalcb,
 	    PSF_DROPPRIVS);
 
-	if (pid != 0) {
+	if (pid == -1)
+		return -1;
+	else if (pid != 0) {
 		ctx->ps_control_data_fd = data_fd[1];
 		close(data_fd[0]);
 		ctx->ps_control = control_new(ctx,
@@ -264,8 +266,7 @@ ps_ctl_start(struct dhcpcd_ctx *ctx)
 			return -1;
 		close(listen_fd[0]);
 		return pid;
-	} else if (pid == -1)
-		return -1;
+	}
 
 	ctx->ps_control_data_fd = data_fd[0];
 	close(data_fd[1]);