From d6201f5d8daada3d64a0a3e0038e14eebec683ce Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Wed, 3 Aug 2016 22:59:23 +0200
Subject: Imported Upstream version 1.2.4

---
 clients/cli/nmcli-completion | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'clients/cli/nmcli-completion')

diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion
index 3c87f6f9..ffab7d8b 100644
--- a/clients/cli/nmcli-completion
+++ b/clients/cli/nmcli-completion
@@ -494,7 +494,7 @@ _nmcli_compl_ARGS()
                 ;;
             vpn-type)
                 if [[ "${#words[@]}" -eq 2 ]]; then
-                    _nmcli_list "vpnc openvpn pptp openconnect openswan libreswan ssh l2tp iodine"
+                    _nmcli_list "vpnc openvpn pptp openconnect openswan libreswan strongswan ssh l2tp iodine fortisslvpn"
                     return 0
                 fi
                 ;;
@@ -579,10 +579,16 @@ _nmcli_compl_ARGS()
             user| \
             username| \
             service| \
-            password| \
+            password)
+                if [[ "${#words[@]}" -eq 2 ]]; then
+                    return 0
+                fi
+                ;;
             passwd-file| \
             file)
                 if [[ "${#words[@]}" -eq 2 ]]; then
+                    compopt -o default
+                    COMPREPLY=()
                     return 0
                 fi
                 ;;
@@ -1379,8 +1385,7 @@ _nmcli()
 
                             OPTIONS=(type file)
                             OPTIONS_MANDATORY=(type file)
-                            ALIASES=("type:vpn-type")
-                            _nmcli_compl_ARGS ${ALIASES[@]}
+                            _nmcli_compl_ARGS type:vpn-type
                             return 0
                         fi
                         ;;
-- 
cgit 1.3.0-6-gf8a5