From a1bcb7ea30524ed1daad6443f1c436a9dcd6f375 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Sat, 13 Dec 2025 10:02:57 -0500
Subject: [PATCH] vpn: just try and import all types on errors

---
 .../network/backend_networkmanager_vpn.go     | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/core/internal/server/network/backend_networkmanager_vpn.go b/core/internal/server/network/backend_networkmanager_vpn.go
index da38e60c..267b969b 100644
--- a/core/internal/server/network/backend_networkmanager_vpn.go
+++ b/core/internal/server/network/backend_networkmanager_vpn.go
@@ -880,29 +880,24 @@ func (b *NetworkManagerBackend) ImportVPN(filePath string, name string) (*VPNImp
 }
 
 func (b *NetworkManagerBackend) importVPNWithNmcli(filePath string, name string) (*VPNImportResult, error) {
-	args := []string{"connection", "import", "type", "openvpn", "file", filePath}
-	cmd := exec.Command("nmcli", args...)
-	output, err := cmd.CombinedOutput()
+	vpnTypes := []string{"openvpn", "wireguard", "vpnc", "pptp", "l2tp", "openconnect", "strongswan"}
+
+	var output []byte
+	var err error
+	for _, vpnType := range vpnTypes {
+		args := []string{"connection", "import", "type", vpnType, "file", filePath}
+		cmd := exec.Command("nmcli", args...)
+		output, err = cmd.CombinedOutput()
+		if err == nil {
+			break
+		}
+	}
 
 	if err != nil {
-		outputStr := string(output)
-		if strings.Contains(outputStr, "vpnc") || strings.Contains(outputStr, "unknown connection type") {
-			for _, vpnType := range []string{"vpnc", "pptp", "l2tp", "openconnect", "strongswan", "wireguard"} {
-				args = []string{"connection", "import", "type", vpnType, "file", filePath}
-				cmd = exec.Command("nmcli", args...)
-				output, err = cmd.CombinedOutput()
-				if err == nil {
-					break
-				}
-			}
-		}
-
-		if err != nil {
-			return &VPNImportResult{
-				Success: false,
-				Error:   fmt.Sprintf("import failed: %s", strings.TrimSpace(string(output))),
-			}, nil
-		}
+		return &VPNImportResult{
+			Success: false,
+			Error:   fmt.Sprintf("import failed: %s", strings.TrimSpace(string(output))),
+		}, nil
 	}
 
 	outputStr := string(output)