From: Roy Marples <roy@marples.name>
Date: Wed, 8 Oct 2014 11:51:34 +0000 (+0000)
Subject: Don't work on bridge interfaces unless explicitly asked to.
X-Git-Tag: v6.5.1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2321ae6f914fee4012fb978d47a1307d3ffeff33;p=thirdparty%2Fdhcpcd.git

Don't work on bridge interfaces unless explicitly asked to.
---

diff --git a/if.c b/if.c
index 70b6de8f..fe099aa6 100644
--- a/if.c
+++ b/if.c
@@ -330,7 +330,13 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 			sdl_type = sdl->sdl_type;
 			switch(sdl->sdl_type) {
 #ifdef IFT_BRIDGE
-			case IFT_BRIDGE: /* FALLTHROUGH */
+			case IFT_BRIDGE:
+				/* Don't allow bridge unless explicit */
+				if (argc == 0 && ctx->ifac == 0) {
+					if_free(ifp);
+					continue;
+				}
+				/* FALLTHOUGH */
 #endif
 #ifdef IFT_L2VLAN
 			case IFT_L2VLAN: /* FALLTHOUGH */