From: Roy Marples <roy@marples.name>
Date: Sat, 19 Sep 2015 16:31:43 +0000 (+0000)
Subject: Fix test mode by checking for an IPv4LL address
X-Git-Tag: v6.9.4~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3516d7e7139e1475237ea67c59fc9d5c8785870f;p=thirdparty%2Fdhcpcd.git

Fix test mode by checking for an IPv4LL address
---

diff --git a/script.c b/script.c
index 86fe9556..44bfed9b 100644
--- a/script.c
+++ b/script.c
@@ -261,10 +261,10 @@ make_env(const struct interface *ifp, const char *reason, char ***argv)
 			ra = 1;
 #endif
 #ifdef INET
-		else if (state->added)
-			dhcp = 1;
-		else
+		else if (istate && istate->addr.s_addr != INADDR_ANY)
 			ipv4ll = 1;
+		else
+			dhcp = 1;
 #endif
 	}
 #ifdef INET6