]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Don't crash when disabling IPv6
authorRoy Marples <roy@marples.name>
Thu, 4 Apr 2013 23:25:31 +0000 (23:25 +0000)
committerRoy Marples <roy@marples.name>
Thu, 4 Apr 2013 23:25:31 +0000 (23:25 +0000)
dhcpcd.c

index 8401cf1095f60a2b0c41f49943bb186243b72379..f01c0a2782f8b752e5c2a0ef44d64fe06611b204 100644 (file)
--- 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);