From: Roy Marples <roy@marples.name>
Date: Tue, 16 Sep 2008 10:02:14 +0000 (+0000)
Subject: Fix discovery
X-Git-Tag: v5.0.0~243
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12653e16439d180b38a660d1137ac8ce8cef475d;p=thirdparty%2Fdhcpcd.git

Fix discovery
---

diff --git a/if-bsd.c b/if-bsd.c
index ef5c1f2d..02f3814d 100644
--- a/if-bsd.c
+++ b/if-bsd.c
@@ -310,7 +310,9 @@ discover_link(struct interface **ifs, int argc, char * const *argv,
 	if (argc > 0) {
 		for (n = 0; n < argc; n++)
 			if (strcmp(ifr->ifr_name, argv[n]) == 0)
-				return;
+				break;
+		if (n == argc)
+			return;
 	} else {
 		for (n = 0; n < ifdc; n++)
 			if (fnmatch(ifdv[n], ifr->ifr_name, 0) == 0)
@@ -343,7 +345,7 @@ discover_link(struct interface **ifs, int argc, char * const *argv,
 		break;
 	}
 	free(sdl);
-	if (ifp && ifl)
+	if (ifl)
 		ifl->next = ifp;
 	else
 		*ifs = ifp;