summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley2006-03-22 16:59:12 +0000
committerRob Landley2006-03-22 16:59:12 +0000
commita35886c86299bbf670d5c6a04284da5be1b62a57 (patch)
tree9efb4b6e955a06945fb003f2ff4ab0257a0fa6fe
parent786988faf7ac9ca384ed4d6ee1095e242c67dc8a (diff)
downloadbusybox-a35886c86299bbf670d5c6a04284da5be1b62a57.zip
busybox-a35886c86299bbf670d5c6a04284da5be1b62a57.tar.gz
Fix from Glenn McGrath.
-rw-r--r--networking/ifupdown.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index c3cfcd8..d4167e9 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -769,7 +769,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
llist_t *iface_list;
for (iface_list = defn->ifaces; iface_list; iface_list = iface_list->link) {
struct interface_defn_t *tmp = (struct interface_defn_t *) iface_list->data;
- if ((strcmp(tmp->iface, currif->iface) == 0) ||
+ if ((strcmp(tmp->iface, currif->iface) == 0) &&
(tmp->address_family == currif->address_family)) {
bb_error_msg("duplicate interface \"%s\"", tmp->iface);
return NULL;