]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Always find delegates regardless of IPv6RS.
authorRoy Marples <roy@marples.name>
Fri, 17 Oct 2014 13:46:19 +0000 (13:46 +0000)
committerRoy Marples <roy@marples.name>
Fri, 17 Oct 2014 13:46:19 +0000 (13:46 +0000)
dhcpcd.c

index 69e43b458614849805f540c088d853e15f0d56be..5a9d4305928716638bbc294459c20d403ded0e78 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -704,6 +704,9 @@ dhcpcd_startinterface(void *arg)
                    !(ifo->options & (DHCPCD_INFORM | DHCPCD_PFXDLGONLY)))
                        ipv6nd_startrs(ifp);
 
+               if (ifo->options & DHCPCD_DHCP6)
+                       dhcp6_find_delegates(ifp);
+
                if (!(ifo->options & DHCPCD_IPV6RS) ||
                    ifo->options & DHCPCD_IA_FORCED)
                {
@@ -712,7 +715,6 @@ dhcpcd_startinterface(void *arg)
                        if (ifo->options & DHCPCD_IA_FORCED)
                                nolease = dhcp6_start(ifp, DH6S_INIT);
                        else {
-                               dhcp6_find_delegates(ifp);
                                nolease = 0;
                                /* Enabling the below doesn't really make
                                 * sense as there is currently no standard