From: Roy Marples <roy@marples.name>
Date: Sun, 9 Jun 2013 10:57:16 +0000 (+0000)
Subject: Don't delete the subnet route if we don't own IPv6RA routes.
X-Git-Tag: v6.0.0~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49559463144402dbe6d3444d80663f9e07666f7c;p=thirdparty%2Fdhcpcd.git

Don't delete the subnet route if we don't own IPv6RA routes.
---

diff --git a/ipv6.c b/ipv6.c
index e2eeb2c7..f4c1d479 100644
--- a/ipv6.c
+++ b/ipv6.c
@@ -419,7 +419,8 @@ ipv6_addaddr(struct ipv6_addr *ap)
 	ap->flags |= IPV6_AF_ADDED;
 	if (ap->delegating_iface)
 		ap->flags |= IPV6_AF_DELEGATED;
-	if (ipv6_removesubnet(ap->iface, ap) == -1)
+	if (ap->iface->options->options & DHCPCD_IPV6RA_OWN &&
+	    ipv6_removesubnet(ap->iface, ap) == -1)
 		syslog(LOG_ERR,"ipv6_removesubnet %m");
 	if (ap->prefix_pltime == ND6_INFINITE_LIFETIME &&
 	    ap->prefix_vltime == ND6_INFINITE_LIFETIME)