From 2a18415aeecb8f8af7e4e77293b0c77620ebdc4c Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 25 Jul 2018 23:14:41 -0700
Subject: [PATCH] Deal with interface names like en3s5
 https://sourceforge.net/p/webadmin/bugs/5164/

---
 net/save_aifc.cgi | 2 +-
 net/save_bifc.cgi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/save_aifc.cgi b/net/save_aifc.cgi
index 826912191..aaa6a55eb 100755
--- a/net/save_aifc.cgi
+++ b/net/save_aifc.cgi
@@ -45,7 +45,7 @@ else {
 		&can_create_iface() || &error($text{'ifcs_ecannot'});
 		&can_iface($a) || &error($text{'ifcs_ecannot'});
 		}
-	elsif ($in{'name'} =~ /^([a-z]+\d*(\.\d+)?):(\d+)$/) {
+	elsif ($in{'name'} =~ /^([a-z]+\d*(s\d*)?(\.\d+)?):(\d+)$/) {
 		# also creating a virtual interface
 		foreach $ea (@acts) {
 			if ($ea->{'name'} eq $1 &&
diff --git a/net/save_bifc.cgi b/net/save_bifc.cgi
index c7fe45572..e9a063f72 100755
--- a/net/save_bifc.cgi
+++ b/net/save_bifc.cgi
@@ -85,7 +85,7 @@ else {
 		$b->{'name'} = $b->{'fullname'} = "bond".$in{'name'};
 		$b->{'bond'} = 1;
 		}
-	elsif ($in{'name'} =~/^[a-z]+\d*(\.\d+)?$/) {
+	elsif ($in{'name'} =~/^[a-z]+\d*(s\d*)?(\.\d+)?$/) {
 		# creating a real interface
 		$b->{'name'} = $in{'name'};
 		$b->{'fullname'} = $in{'name'};