From: Roy Marples <roy@marples.name>
Date: Tue, 2 Apr 2013 16:49:36 +0000 (+0000)
Subject: Stop ipv6only enabling RS support.
X-Git-Tag: v5.99.6~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f0addfd5555590793b95cb86e8267fd90da05f2;p=thirdparty%2Fdhcpcd.git

Stop ipv6only enabling RS support.
---

diff --git a/if-options.c b/if-options.c
index 2c83cf7d..47e8e6f7 100644
--- a/if-options.c
+++ b/if-options.c
@@ -874,12 +874,12 @@ parse_option(struct if_options *ifo, int opt, const char *arg)
 		ifdv = splitv(&ifdc, ifdv, arg);
 		break;
 	case '4':
-		ifo->options &= ~(DHCPCD_IPV6 | DHCPCD_IPV6RS);
+		ifo->options &= ~DHCPCD_IPV6;
 		ifo->options |= DHCPCD_IPV4;
 		break;
 	case '6':
 		ifo->options &= ~DHCPCD_IPV4;
-		ifo->options |= DHCPCD_IPV6 | DHCPCD_IPV6RS;
+		ifo->options |= DHCPCD_IPV6;
 		break;
 #ifdef INET
 	case O_ARPING:
@@ -1165,12 +1165,15 @@ read_config(const char *file,
 	}
 
 	/* Terminate the encapsulated options */
-	if (ifo && ifo->vendor[0] && !(ifo->options & DHCPCD_VENDORRAW)) {
+	if (ifo->vendor[0] && !(ifo->options & DHCPCD_VENDORRAW)) {
 		ifo->vendor[0]++;
 		ifo->vendor[ifo->vendor[0]] = DHO_END;
 	}
 
 #ifdef INET6
+	if (!(ifo->options & DHCPCD_IPV6))
+		ifo->options &= ~DHCPCD_IPV6RS;
+
 	if (ifname && ifo->iaid_len == 0 && ifo->options & DHCPCD_IPV6) {
 		ifo->iaid = malloc(sizeof(*ifo->iaid));
 		if (ifo->iaid == NULL)