Mercurial > hg > dhcpcd

changeset 2271:3f402daf273e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only check auto-configure in the DISCOVER state.
author Roy Marples <roy@marples.name>
date Fri, 31 Jan 2014 22:28:16 +0000
parents ac944f101beb
children 70151201c430
files dhcp.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dhcp.c	Fri Jan 31 22:15:50 2014 +0000
+++ b/dhcp.c	Fri Jan 31 22:28:16 2014 +0000
@@ -2274,7 +2274,9 @@
 			    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",