From: Rob Landley <rob@landley.net>
Date: Wed, 22 Mar 2006 16:59:12 +0000 (-0000)
Subject: Fix from Glenn McGrath.
X-Git-Tag: 1_1_0~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a35886c86299bbf670d5c6a04284da5be1b62a57;p=oweals%2Fbusybox.git

Fix from Glenn McGrath.
---

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index c3cfcd8b3..d4167e9a0 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;