From: Roy Marples <roy@marples.name>
Date: Thu, 5 Mar 2015 19:43:46 +0000 (+0000)
Subject: Add support for IFT_PPP and IFT_PROPVIRTUAL.
X-Git-Tag: v6.8.0~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42bade9fadde446d82c27028837f21b078a794e8;p=thirdparty%2Fdhcpcd.git

Add support for IFT_PPP and IFT_PROPVIRTUAL.
Thanks to Guy Yur.
---

diff --git a/if.c b/if.c
index 7d1126cf..3eb85796 100644
--- a/if.c
+++ b/if.c
@@ -331,8 +331,16 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 			ifp->index = sdl->sdl_index;
 			switch(sdl->sdl_type) {
 #ifdef IFT_BRIDGE
-			case IFT_BRIDGE:
-				/* Don't allow bridge unless explicit */
+			case IFT_BRIDGE: /* FALLTHROUGH */
+#endif
+#ifdef IFT_PPP
+			case IFT_PPP: /* FALLTHROUGH */
+#endif
+#ifdef IFT_PROPVIRTUAL
+			case IFT_PROPVIRTUAL: /* FALLTHROUGH */
+#endif
+#if defined(IFT_BRIDGE) || defined(IFT_PPP) || defined(IFT_PROPVIRTUAL)
+				/* Don't allow unless explicit */
 				if ((argc == 0 || argc == -1) &&
 				    ctx->ifac == 0 &&
 				    !if_hasconf(ctx, ifp->name))
@@ -340,10 +348,10 @@ if_discover(struct dhcpcd_ctx *ctx, int argc, char * const *argv)
 					if_free(ifp);
 					continue;
 				}
-				/* FALLTHOUGH */
+				/* FALLTHROUGH */
 #endif
 #ifdef IFT_L2VLAN
-			case IFT_L2VLAN: /* FALLTHOUGH */
+			case IFT_L2VLAN: /* FALLTHROUGH */
 #endif
 #ifdef IFT_L3IPVLAN
 			case IFT_L3IPVLAN: /* FALLTHROUGH */