summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2020-06-10 07:34:18 +0100
committerRoy Marples <roy@marples.name>2020-06-10 07:37:13 +0100
commit8a0eb8db023be32c112847582446be48ee34dbf0 (patch)
tree70bcd4e84a3f20ebc2f2d3a58b8c9f884941ef25
parent9ef8622c6dcf2f72d5c0fb83d8e29abd6a2e2971 (diff)
downloaddhcpcd-8a0eb8db023be32c112847582446be48ee34dbf0.tar.xz
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.
-rw-r--r--src/dhcpcd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index 581050e0..6daa7c4f 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -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;