]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
DHCP6: Apply delegations to interface on carrier up
authorRoy Marples <roy@marples.name>
Wed, 10 Jun 2020 06:34:18 +0000 (07:34 +0100)
committerRoy Marples <roy@marples.name>
Wed, 10 Jun 2020 06:37:13 +0000 (07:37 +0100)
Even with DHCP6 turned off for the interface.
As long as it was activated by another interface this is fine.

src/dhcpcd.c

index 581050e0a293cbf8101d310b27e5604b8d912da8..6daa7c4f5fef1aa041796be7bbc7f354fdd0c261 100644 (file)
@@ -929,9 +929,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;