svn commit: trunk/busybox/networking

landley at busybox.net landley at busybox.net
Wed Mar 22 16:59:14 UTC 2006


Author: landley
Date: 2006-03-22 08:59:12 -0800 (Wed, 22 Mar 2006)
New Revision: 14603

Log:
Fix from Glenn McGrath.


Modified:
   trunk/busybox/networking/ifupdown.c


Changeset:
Modified: trunk/busybox/networking/ifupdown.c
===================================================================
--- trunk/busybox/networking/ifupdown.c	2006-03-22 15:49:22 UTC (rev 14602)
+++ trunk/busybox/networking/ifupdown.c	2006-03-22 16:59:12 UTC (rev 14603)
@@ -769,7 +769,7 @@
 					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;




More information about the busybox-cvs mailing list