From: Roy Marples <roy@marples.name>
Date: Fri, 17 Oct 2014 13:46:19 +0000 (+0000)
Subject: Always find delegates regardless of IPv6RS.
X-Git-Tag: v6.5.1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e11a3c1cfaa047c29be0a3de821670e6dff518f4;p=thirdparty%2Fdhcpcd.git

Always find delegates regardless of IPv6RS.
---

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