diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-05-26 22:39:02 -0700 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-05-26 22:39:02 -0700 |
| commit | 5e79eac7ae28ba028b3d2e3a0b74ecd7a7b1455a (patch) | |
| tree | d76916ae8e746e61bbea626007ffff6734eaef67 | |
| parent | abd43697ee0e5cf054a8ac0288ff78435c9c0563 (diff) | |
| parent | 4896020276a93c73276dad073341ab6f9bc9a1ca (diff) | |
| download | vyatta-cfg-vpn-5e79eac7ae28ba028b3d2e3a0b74ecd7a7b1455a.tar.gz vyatta-cfg-vpn-5e79eac7ae28ba028b3d2e3a0b74ecd7a7b1455a.zip | |
Merge pull request #4 from TriJetScud/helium
Remove automatic IKE version negoiation.
| -rwxr-xr-x | scripts/vpn-config.pl | 7 | ||||
| -rw-r--r-- | templates/vpn/ipsec/ike-group/node.tag/key-exchange/node.def | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl index f1d4e46..4e56a99 100755 --- a/scripts/vpn-config.pl +++ b/scripts/vpn-config.pl @@ -897,13 +897,10 @@ if ( $vcVPN->exists('ipsec') ) { my $key_exchange = $vcVPN->returnValue( "ipsec ike-group $ike_group key-exchange"); if ( defined($key_exchange) ) { - if ($key_exchange eq 'auto') { - $genout .= "\tkeyexchange=ike\n"; - } - elsif ($key_exchange eq 'ikev1') { + if ($key_exchange eq 'ikev1') { $genout .= "\tkeyexchange=ikev1\n"; } - elsif ($key_exchange eq 'ikev2') { + if ($key_exchange eq 'ikev2') { $genout .= "\tkeyexchange=ikev2\n"; } } diff --git a/templates/vpn/ipsec/ike-group/node.tag/key-exchange/node.def b/templates/vpn/ipsec/ike-group/node.tag/key-exchange/node.def index e3555d4..f68dc69 100644 --- a/templates/vpn/ipsec/ike-group/node.tag/key-exchange/node.def +++ b/templates/vpn/ipsec/ike-group/node.tag/key-exchange/node.def @@ -1,7 +1,6 @@ help: Key Exchange Version type: txt default: "ikev1" -syntax:expression: $VAR(@) in "ike", "ikev1", "ikev2"; "must be ike, ikev1 or ikev2" -val_help: ike; Automatically negoiatate Key Exchange version -val_help: ikev1; Force IKEv1 for Key Exchange [DEFAULT] -val_help: ikev2; Force IKEv2 for Key Exchange +syntax:expression: $VAR(@) in "ikev1", "ikev2"; "must be ikev1 or ikev2" +val_help: ikev1; Use IKEv1 for Key Exchange [DEFAULT] +val_help: ikev2; Use IKEv2 for Key Exchange |