From: Roy Marples <roy@marples.name>
Date: Thu, 10 Oct 2019 10:20:09 +0000 (+0100)
Subject: DHCP6: Remove 0 sla and 0 prefix means whole prefix.
X-Git-Tag: v8.1.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bb6508ca46a3bc6be355b12943e26fbceafd864;p=thirdparty%2Fdhcpcd.git

DHCP6: Remove 0 sla and 0 prefix means whole prefix.

If we get a /48 we can still use /64 with a sla of 0.
It's all valid, my bad.
---

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 1d409e76..4ef2e565 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -532,13 +532,6 @@ dhcp6_delegateaddr(struct in6_addr *addr, struct interface *ifp,
 		asla.prefix_len = 0;
 		asla.sla_set = 0;
 		sla = &asla;
-	} else if (sla->sla == 0 && sla->prefix_len == 0) {
-		/* An SLA of 0 was set with no prefix length specified.
-		 * This means we delegate the whole prefix. */
-		asla.sla = sla->sla;
-		asla.prefix_len = prefix->prefix_len;
-		asla.sla_set = 0;
-		sla = &asla;
 	} else if (sla->prefix_len == 0) {
 		/* An SLA was given, but prefix length was not.
 		 * We need to work out a suitable prefix length for