Release dhcpcd-4.99.17

diff --git a/config.h b/config.h
index 098d61977255cee26437450dc135d0c9732b1d8d..ae000d18503ea28bcafdedd3849dc0de3171c3a7 100644 (file)
--- a/config.h
+++ b/config.h
@@ -28,7 +28,7 @@
 #define CONFIG_H
 
 #define PACKAGE                        "dhcpcd"
-#define VERSION                        "4.99.16"
+#define VERSION                        "4.99.17"
 
 /* Some systems do not have a working fork. */
 /* #define THERE_IS_NO_FORK */

diff --git a/net.c b/net.c
index e5b5f770ee4e9c021cddbf918daeda72088a4d5e..c39ab75489fddaaba9802d94bfc389770ba15dd2 100644 (file)
--- a/net.c
+++ b/net.c
@@ -279,6 +279,13 @@ discover_interfaces(int argc, char * const *argv)
                if (ifa->ifa_addr->sa_family != AF_PACKET)
                        continue;
 #endif
+               /* It's possible for an interface to have >1 AF_LINK.
+                * For our purposes, we use the first one. */
+               for (ifp = ifs; ifp; ifp = ifp->next)
+                       if (strcmp(ifp->name, ifa->ifa_name) == 0)
+                               break;
+               if (ifp)
+                       continue;
                if (argc > 0) {
                        for (i = 0; i < argc; i++) {
 #ifdef __linux__