From: Roy Marples <roy@marples.name>
Date: Wed, 1 Apr 2015 21:29:13 +0000 (+0000)
Subject: Don't attmept IPv6 ownage when dumping leases.
X-Git-Tag: v6.8.2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6957da48e30408a426ce7db2fb58e946952cbf2;p=thirdparty%2Fdhcpcd.git

Don't attmept IPv6 ownage when dumping leases.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 5bd0c776..0ce32dc2 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -378,7 +378,7 @@ configure_interface1(struct interface *ifp)
 		ifo->options &= ~(DHCPCD_IPV6RS | DHCPCD_DHCP6);
 
 	if (ifo->options & DHCPCD_SLAACPRIVATE &&
-	    !(ifp->ctx->options & DHCPCD_TEST))
+	    !(ifp->ctx->options & (DHCPCD_DUMPLEASE | DHCPCD_TEST)))
 		ifo->options |= DHCPCD_IPV6RA_OWN;
 
 	/* If we're a psuedo interface, ensure we disable as much as we can */
@@ -396,7 +396,8 @@ configure_interface1(struct interface *ifp)
 		    ifp->options->options & DHCPCD_IPV6RA_OWN ? 1 : 0);
 		if (ra_global == -1 || ra_iface == -1)
 			ifo->options &= ~DHCPCD_IPV6RS;
-		else if (ra_iface == 0 && !(ifp->ctx->options & DHCPCD_TEST))
+		else if (ra_iface == 0 &&
+		    !(ifp->ctx->options & (DHCPCD_DUMPLEASE | DHCPCD_TEST)))
 			ifo->options |= DHCPCD_IPV6RA_OWN;
 	}