diff options
| author | Jason Hendry <jhendry@mintel.com> | 2014-12-01 21:21:24 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-12-23 01:45:56 +0100 |
| commit | 34e0d85f854b3774112cde6195088844bd2e9362 (patch) | |
| tree | 49b767b2d9ad2a7f564839750b8448abeed1c6d3 | |
| parent | cf2b95744945ae8852e36dc4cd2c0eeab4ae5ba1 (diff) | |
| download | vyatta-cfg-vpn-34e0d85f854b3774112cde6195088844bd2e9362.tar.gz vyatta-cfg-vpn-34e0d85f854b3774112cde6195088844bd2e9362.zip | |
Fixing syntax error in vpn-config.pl, fixing allowed parameters in the per-tunnel ikev2-reauth node
| -rwxr-xr-x | scripts/vpn-config.pl | 2 | ||||
| -rw-r--r-- | templates/vpn/ipsec/site-to-site/peer/node.tag/ikev2-reauth/node.def | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl index cd4166b..2228997 100755 --- a/scripts/vpn-config.pl +++ b/scripts/vpn-config.pl @@ -815,7 +815,7 @@ if ($vcVPN->exists('ipsec')) { # # Get ikev2-reauth configuration # - if ((defined($key_exchange) && ($key_exchange eq 'ikev2')) { + if ((defined($key_exchange)) && ($key_exchange eq 'ikev2')) { my $ikev2_tunnel_reauth = $vcVPN->returnValue("ipsec site-to-site peer $peer ikev2-reauth"); if ((defined($ikev2_tunnel_reauth)) && ($ikev2_tunnel_reauth ne 'inherit')) { diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/ikev2-reauth/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/ikev2-reauth/node.def index 8aee33e..8e1c6d7 100644 --- a/templates/vpn/ipsec/site-to-site/peer/node.tag/ikev2-reauth/node.def +++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/ikev2-reauth/node.def @@ -1,7 +1,7 @@ help: Re-authentication of the remote peer during an IKE re-key. IKEv2 option only type: txt default: "inherit" -syntax:expression: $VAR(@) in "yes", "no"; "must be yes, no or inherit (Default)" +syntax:expression: $VAR(@) in "yes", "no", "inherit"; "must be yes, no or inherit (Default)" val_help: yes; Enable remote host re-autentication during an IKE re-key. Currently broken due to a strong swan bug val_help: no; Disable remote host re-authenticaton during an IKE re-key. -val_help: inherit; Inherit the reauth configuration form your IKE-group +val_help: inherit; Inherit the reauth configuration form your IKE-group (Default) |