From: Roy Marples <roy@marples.name>
Date: Fri, 31 Jan 2014 22:28:16 +0000 (+0000)
Subject: Only check auto-configure in the DISCOVER state.
X-Git-Tag: v6.3.0~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b77f22472a0c34395c60bb6baabc62a24aabe80e;p=thirdparty%2Fdhcpcd.git

Only check auto-configure in the DISCOVER state.
---

diff --git a/dhcp.c b/dhcp.c
index bc56a00f..b9b6c463 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -2274,7 +2274,9 @@ dhcp_handledhcp(struct interface *iface, struct dhcp_message **dhcpp,
 			    iface->name, msg);
 			free(msg);
 		}
-		if (get_option_uint8(&tmp, dhcp, DHO_AUTOCONFIGURE) != 0) {
+		if (state->state == DHS_DISCOVER &&
+		    get_option_uint8(&tmp, dhcp, DHO_AUTOCONFIGURE) != 0)
+		{
 			switch (tmp) {
 			case 0:
 				log_dhcp(LOG_WARNING, "IPv4LL disabled from",