From: Roy Marples <roy@marples.name>
Date: Fri, 30 Aug 2019 11:50:00 +0000 (+0100)
Subject: Better fix for prior.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b99ba841c9b481c4f457233ef31ec6ac8eed336;p=thirdparty%2Fdhcpcd.git

Better fix for prior.
---

diff --git a/src/ipv6.c b/src/ipv6.c
index c296679b..419a3db3 100644
--- a/src/ipv6.c
+++ b/src/ipv6.c
@@ -1231,7 +1231,8 @@ out:
 	 * or DHCP6 handlers and the existance of any useable
 	 * global address on the interface has changed,
 	 * call rt_build to add/remove the default route. */
-	if (!(ctx->options & DHCPCD_RTBUILD) &&
+	if (ifp->active && ifp->options->options & DHCPCD_IPV6 &&
+	    !(ctx->options & DHCPCD_RTBUILD) &&
 	    (ipv6_ifanyglobal(ifp) != NULL) != anyglobal)
 		rt_build(ctx, AF_INET6);
 }
@@ -2295,9 +2296,6 @@ inet6_raroutes(rb_tree_t *routes, struct dhcpcd_ctx *ctx)
 	struct ra *rap;
 	const struct ipv6_addr *addr;
 
-	if (ctx->ra_routers == NULL)
-		return 0;
-
 	TAILQ_FOREACH(rap, ctx->ra_routers, next) {
 		if (rap->expired)
 			continue;