From: Roy Marples <roy@marples.name>
Date: Fri, 24 Oct 2014 19:24:29 +0000 (+0000)
Subject: We should not use a DHCP lease for IPV4LL.
X-Git-Tag: v6.6.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ed4bfa16d4f86bdf572e14086db72c2a028ea2d;p=thirdparty%2Fdhcpcd.git

We should not use a DHCP lease for IPV4LL.
---

diff --git a/ipv4ll.c b/ipv4ll.c
index eaa56435..17657401 100644
--- a/ipv4ll.c
+++ b/ipv4ll.c
@@ -226,9 +226,10 @@ ipv4ll_start(void *arg)
 		return;
 	}
 
-	if (state->offer) {
+	if (state->offer && IN_LINKLOCAL(ntohl(state->offer->yiaddr))) {
 		astate->addr.s_addr = state->offer->yiaddr;
 		free(state->offer);
+		state->offer = NULL;
 		ap = ipv4_iffindaddr(ifp, &astate->addr, NULL);
 	} else
 		ap = ipv4_iffindlladdr(ifp);