summaryrefslogtreecommitdiffstats
path: root/dhcpcd.c
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2014-10-17 13:46:19 +0000
committerRoy Marples <roy@marples.name>2014-10-17 13:46:19 +0000
commite11a3c1cfaa047c29be0a3de821670e6dff518f4 (patch)
tree8d1ff0d6671a946702ceb6fd65b75708db16fb40 /dhcpcd.c
parent91779f04e1dbb91c9ae74808d5ae8c93965411da (diff)
downloaddhcpcd-e11a3c1cfaa047c29be0a3de821670e6dff518f4.tar.xz
Always find delegates regardless of IPv6RS.
Diffstat (limited to 'dhcpcd.c')
-rw-r--r--dhcpcd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/dhcpcd.c b/dhcpcd.c
index 69e43b45..5a9d4305 100644
--- 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