From: Roy Marples <roy@marples.name>
Date: Thu, 4 Apr 2013 23:25:31 +0000 (+0000)
Subject: Don't crash when disabling IPv6
X-Git-Tag: v5.99.6~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66cf1d5db5bbbd531737f4f639fd554a99bf5473;p=thirdparty%2Fdhcpcd.git

Don't crash when disabling IPv6
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 8401cf10..f01c0a27 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -425,11 +425,11 @@ start_interface(void *arg)
 		return;
 	}
 
-	if (options & DHCPCD_IPV6RS && ifo->options & DHCPCD_IPV6RS &&
-	    !(ifo->options & DHCPCD_INFORM))
-		ipv6rs_start(ifp);
-
 	if (ifo->options & DHCPCD_IPV6) {
+		if (ifo->options & DHCPCD_IPV6RS &&
+		    !(ifo->options & DHCPCD_INFORM))
+			ipv6rs_start(ifp);
+
 		if (!(ifo->options & DHCPCD_IPV6RS)) {
 			if (ifo->options & DHCPCD_IA_FORCED)
 				nolease = dhcp6_start(ifp, 1);