From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH] ipsec: accept also psk and use pre-shared-key instead of psk Date: Wed, 16 Aug 2017 09:02:47 +0200 Message-ID: <1502866967-8183-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3423321326543236226==" List-Id: --===============3423321326543236226== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Fixes: #11454 Signed-off-by: Jonatan Schlag --- src/bash-completion/network | 2 +- src/functions/functions.ipsec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bash-completion/network b/src/bash-completion/network index 5ddc8db..15bb9e8 100644 --- a/src/bash-completion/network +++ b/src/bash-completion/network @@ -446,7 +446,7 @@ _network_vpn_ipsec_connection_subcommands_authentication(= ) { shift local words=3D( $@ ) =20 - local commands=3D"psk mode" + local commands=3D"mode pre-shared-key" local cmd=3D"$(_network_find_on_cmdline "${commands}")" if [[ -z "${cmd}" ]]; then COMPREPLY=3D( $(compgen -W "${commands}" -- "${cur}") ) diff --git a/src/functions/functions.ipsec b/src/functions/functions.ipsec index 7283836..bb0dc2e 100644 --- a/src/functions/functions.ipsec +++ b/src/functions/functions.ipsec @@ -57,7 +57,7 @@ IPSEC_DEFAULT_START_ACTION=3D"on-demand" IPSEC_DEFAULT_TYPE=3D"net-to-net" =20 IPSEC_VALID_MODES=3D"gre-transport tunnel vti" -IPSEC_VALID_AUTH_MODES=3D"PSK" +IPSEC_VALID_AUTH_MODES=3D"PSK psk" =20 cli_ipsec() { local action=3D${1} --=20 2.6.3 --===============3423321326543236226==--