projects
/
project
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
fccc53a
)
Merge pull request #7 from dedeckeh/bugfixes
author
sbyx
<steven@midlink.org>
Tue, 14 Jan 2014 14:53:10 +0000
(06:53 -0800)
committer
sbyx
<steven@midlink.org>
Tue, 14 Jan 2014 14:53:10 +0000
(06:53 -0800)
Fix interface ignore overwrite
src/config.c
patch
|
blob
|
history
diff --git
a/src/config.c
b/src/config.c
index
46137a4
..
b6b3708
100644
(file)
--- 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: