Mercurial > hg > dhcpcd

changeset 5343:8b216a105409 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Roy Marples <roy@marples.name>
date Wed, 10 Jun 2020 07:34:18 +0100
parents b5656c618975
children 3df49497d40b
files src/dhcpcd.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/dhcpcd.c	Wed Jun 10 07:16:41 2020 +0100
+++ b/src/dhcpcd.c	Wed Jun 10 07:34:18 2020 +0100
@@ -943,9 +943,12 @@
 		}
 
 #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;