From: Roy Marples <roy@marples.name>
Date: Wed, 2 Oct 2019 16:06:18 +0000 (+0100)
Subject: DHCP: Don't exit on static DaD failure if master or using IPv6.
X-Git-Tag: v8.1.0~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a83e58777b583d0cab2cd1384b38c1ac3279ad8;p=thirdparty%2Fdhcpcd.git

DHCP: Don't exit on static DaD failure if master or using IPv6.

As RA and DHCPv6 work fine too.
---

diff --git a/src/dhcp.c b/src/dhcp.c
index fd4ee9f4..76ead6dc 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -2043,7 +2043,8 @@ dhcp_addr_duplicated(struct interface *ifp, struct in_addr *ia)
 	if (opts & (DHCPCD_STATIC | DHCPCD_INFORM)) {
 		state->reason = "EXPIRE";
 		script_runreason(ifp, state->reason);
-		if (!(ctx->options & DHCPCD_MASTER))
+#define NOT_ONLY_SELF (DHCPCD_MASTER | DHCPCD_IPV6RS | DHCPCD_DHCP6)
+		if (!(ctx->options & NOT_ONLY_SELF))
 			eloop_exit(ifp->ctx->eloop, EXIT_FAILURE);
 		return deleted;
 	}