public inbox for network@lists.ipfire.org
 help / color / mirror / Atom feed
* [PATCH] ipsec: accept also psk and use pre-shared-key instead of psk
@ 2017-08-16  7:02 Jonatan Schlag
  0 siblings, 0 replies; only message in thread
From: Jonatan Schlag @ 2017-08-16  7:02 UTC (permalink / raw)
  To: network

[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]

Fixes: #11454

Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
 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=( $@ )
 
-	local commands="psk mode"
+	local commands="mode pre-shared-key"
 	local cmd="$(_network_find_on_cmdline "${commands}")"
 	if [[ -z "${cmd}" ]]; then
 		COMPREPLY=( $(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="on-demand"
 IPSEC_DEFAULT_TYPE="net-to-net"
 
 IPSEC_VALID_MODES="gre-transport tunnel vti"
-IPSEC_VALID_AUTH_MODES="PSK"
+IPSEC_VALID_AUTH_MODES="PSK psk"
 
 cli_ipsec() {
 	local action=${1}
-- 
2.6.3


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2017-08-16  7:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-16  7:02 [PATCH] ipsec: accept also psk and use pre-shared-key instead of psk Jonatan Schlag

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox