From: sbyx <steven@midlink.org>
Date: Tue, 14 Jan 2014 14:53:10 +0000 (-0800)
Subject: Merge pull request #7 from dedeckeh/bugfixes
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=commitdiff_plain;h=f15a59899a18e2bfaf839461adf54106e1c48b34;hp=fccc53a8947946b9c8ee1cc5e3e038cf4afc8e17

Merge pull request #7 from dedeckeh/bugfixes

Fix interface ignore overwrite
---

diff --git a/src/config.c b/src/config.c
index 46137a4..b6b3708 100644
--- a/src/config.c
+++ b/src/config.c
@@ -302,6 +302,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	if (ifname)
 		strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
 
+	if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
+		return -1;
+
 	iface->inuse = true;
 
 	if ((c = tb[IFACE_ATTR_DYNAMICDHCP]))
@@ -494,7 +497,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 		}
 	}
 
-	iface->ignore = (iface->ifindex = if_nametoindex(iface->ifname)) <= 0;
 	return 0;
 
 err: