summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-04-19 18:23:47 +0000
committerRoy Marples <roy@marples.name>2009-04-19 18:23:47 +0000
commit0b07851c19199d7a7a9bc7ba3236555a8c0d81a3 (patch)
tree02a7dd641f82b5c452c24df0ea7ccf0ac0c3902f
parentff021b0b5dc1b9060b45e0451d02f1bf58cc75fc (diff)
downloaddhcpcd-0b07851c19199d7a7a9bc7ba3236555a8c0d81a3.tar.xz
Release dhcpcd-4.99.17
-rw-r--r--config.h2
-rw-r--r--net.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/config.h b/config.h
index 098d6197..ae000d18 100644
--- 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 e5b5f770..c39ab754 100644
--- 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__