From: Roy Marples <roy@marples.name>
Date: Wed, 10 Jun 2020 06:34:18 +0000 (+0100)
Subject: DHCP6: Apply delegations to interface on carrier up
X-Git-Tag: v9.1.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe3409e0903d6b38be52ee99c1f47bc6e278d2b6;p=thirdparty%2Fdhcpcd.git

DHCP6: Apply delegations to interface on carrier up

Even with DHCP6 turned off for the interface.
As long as it was activated by another interface this is fine.
---

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index 0ccfe8ac..e6ff2766 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -943,9 +943,12 @@ dhcpcd_startinterface(void *arg)
 		}
 
 #ifdef DHCP6
-		if (ifo->options & DHCPCD_DHCP6) {
+		/* DHCPv6 could be turned off, but the interface
+		 * is still delegated to. */
+		if (ifp->active)
 			dhcp6_find_delegates(ifp);
 
+		if (ifo->options & DHCPCD_DHCP6) {
 			if (ifp->active == IF_ACTIVE_USER) {
 				enum DH6S d6_state;