From: Steven Noonan <steven@uplinklabs.net>
Date: Tue, 24 Sep 2019 05:53:40 +0000 (-0700)
Subject: interface: allow overriding speed/cap/if_index for named interfaces
X-Git-Tag: ldb-2.2.0~631
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5944ec38cd9462643f82bf733a86a8e405bc0594;p=thirdparty%2Fsamba.git

interface: allow overriding speed/cap/if_index for named interfaces

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index af81695abab..55fa8534976 100644
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -449,17 +449,6 @@ static void interpret_interface(char *token)
 	bool cap_set = false;
 	bool if_index_set = false;
 
-	/* first check if it is an interface name */
-	for (i=0;i<total_probed;i++) {
-		if (gen_fnmatch(token, probed_ifaces[i].name) == 0) {
-			add_interface(&probed_ifaces[i]);
-			added = true;
-		}
-	}
-	if (added) {
-		return;
-	}
-
 	/*
 	 * extract speed / capability information if present
 	 */
@@ -478,6 +467,26 @@ static void interpret_interface(char *token)
 		}
 	}
 
+	/* first check if it is an interface name */
+	for (i=0;i<total_probed;i++) {
+		if (gen_fnmatch(token, probed_ifaces[i].name) == 0) {
+			if (speed_set) {
+				probed_ifaces[i].linkspeed = speed;
+			}
+			if (cap_set) {
+				probed_ifaces[i].capability = cap;
+			}
+			if (if_index_set) {
+				probed_ifaces[i].if_index = if_index;
+			}
+			add_interface(&probed_ifaces[i]);
+			added = true;
+		}
+	}
+	if (added) {
+		return;
+	}
+
 	p = strchr_m(token,'/');
 	if (p == NULL) {
 		if (!interpret_string_addr(&ss, token, 0)) {