From: Roy Marples <roy@marples.name>
Date: Wed, 27 Nov 2019 15:06:47 +0000 (+0000)
Subject: DHCP6: Fix prior to log an error
X-Git-Tag: v8.1.3~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3275d5b99f2bb260bbfd36248b66a3ed360dcca;p=thirdparty%2Fdhcpcd.git

DHCP6: Fix prior to log an error
---

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 764e57e0..cd67b9bb 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -3681,15 +3681,6 @@ dhcp6_activateinterfaces(struct interface *ifp)
 }
 #endif
 
-static int
-dhcp6_open(struct dhcpcd_ctx *ctx)
-{
-
-	if (ctx->dhcp6_fd == -1)
-		ctx->dhcp6_fd = dhcp6_openudp(0, NULL);
-	return ctx->dhcp6_fd;
-}
-
 static void
 dhcp6_start1(void *arg)
 {
@@ -3700,9 +3691,12 @@ dhcp6_start1(void *arg)
 	size_t i;
 	const struct dhcp_compat *dhc;
 
-	if (ctx->options & DHCPCD_MASTER) {
-		if (dhcp6_open(ctx) == -1)
+	if (ctx->options & DHCPCD_MASTER && ctx->dhcp6_fd == -1) {
+		ctx->dhcp6_fd = dhcp6_openudp(0, NULL);
+		if (ctx->dhcp6_fd == -1) {
+			logerr(__func__);
 			return;
+		}
 		eloop_event_add(ctx->eloop, ctx->dhcp6_fd, dhcp6_recvctx, ctx);
 	}