diff src/route.c @ 5546:08426e8a98a7 draft

DHCP6: Delegated activations work once more This was broken with the --noconfigure option in dhcpcd-9.3.3
author Roy Marples <roy@marples.name>
date Sat, 21 Nov 2020 11:59:07 +0000
parents d40f87a25035
children 4fe5c2a71254
line wrap: on
line diff
--- a/src/route.c	Sat Nov 21 08:46:30 2020 +0000
+++ b/src/route.c	Sat Nov 21 11:59:07 2020 +0000
@@ -713,8 +713,10 @@
 #endif
 
 	RB_TREE_FOREACH_SAFE(rt, &routes, rtn) {
-		if (rt->rt_ifp->active &&
-		    !(rt->rt_ifp->options->options & DHCPCD_CONFIGURE))
+		if (rt->rt_ifp->active) {
+			if (!(rt->rt_ifp->options->options & DHCPCD_CONFIGURE))
+				continue;
+		} else if (!(ctx->options & DHCPCD_CONFIGURE))
 			continue;
 #ifdef BSD
 		if (rt_is_default(rt) &&