From c98c98fb4f1c6e229d462429c14d099cb4712c56 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 2 Oct 2019 17:06:18 +0100 Subject: [PATCH] DHCP: Don't exit on static DaD failure if master or using IPv6. As RA and DHCPv6 work fine too. --- src/dhcp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; } -- 2.47.2