From: Jonatan Schlag <jonatan.schlag@ipfire.org>
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 [thread overview]
Message-ID: <1502866967-8183-1-git-send-email-jonatan.schlag@ipfire.org> (raw)
[-- 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
reply other threads:[~2017-08-16 7:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1502866967-8183-1-git-send-email-jonatan.schlag@ipfire.org \
--to=jonatan.schlag@ipfire.org \
--cc=network@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox