From f17d91d410d489a18d7a8edf67b72f5088b7f6dd Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 2 Sep 2009 20:10:55 +0000 Subject: [PATCH] We should not affect other interfaces when handling new interface notifications. --- dhcpcd.c | 3 ++- net.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dhcpcd.c b/dhcpcd.c index 548f0152..1e5a95ea 100644 --- a/dhcpcd.c +++ b/dhcpcd.c @@ -1187,6 +1187,7 @@ void handle_interface(int action, const char *ifname) { struct interface *ifs, *ifp, *ifn, *ifl = NULL; + const char * const argv[] = { ifname }; int i; if (action == -1) { @@ -1208,7 +1209,7 @@ handle_interface(int action, const char *ifname) return; } - ifs = discover_interfaces(0, NULL); + ifs = discover_interfaces(-1, UNCONST(argv)); for (ifp = ifs; ifp; ifp = ifp->next) { if (strcmp(ifp->name, ifname) != 0) continue; diff --git a/net.c b/net.c index b00e012b..83de3b41 100644 --- a/net.c +++ b/net.c @@ -308,6 +308,11 @@ discover_interfaces(int argc, char * const *argv) continue; p = argv[i]; } else { + /* -1 means we're discovering against a specific + * interface, but we still need the below rules + * to apply. */ + if (argc == -1 && strcmp(argv[0], ifa->ifa_name) != 0) + continue; for (i = 0; i < ifdc; i++) if (!fnmatch(ifdv[i], ifa->ifa_name, 0)) break; -- 2.47.2