]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Don't attmept IPv6 ownage when dumping leases.
authorRoy Marples <roy@marples.name>
Wed, 1 Apr 2015 21:29:13 +0000 (21:29 +0000)
committerRoy Marples <roy@marples.name>
Wed, 1 Apr 2015 21:29:13 +0000 (21:29 +0000)
dhcpcd.c

index 5bd0c776989a2e57ac85e08a66d4c5412092e6ca..0ce32dc260c4397081a8956566f7853dc855895e 100644 (file)
--- 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;
        }