summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Leung <jleung@v10networks.ca>2016-01-29 18:43:45 -0500
committerJeff Leung <jleung@v10networks.ca>2016-01-29 18:43:45 -0500
commit5ee99ec9d5cca8c13804964eee23ce0b15578edf (patch)
tree7c502f983d99b13b17a2521a0e05b184d055dc89
parent9e5c1863dde4762120d52f851d25178d8be5bb24 (diff)
downloadvyatta-cfg-vpn-5ee99ec9d5cca8c13804964eee23ce0b15578edf.tar.gz
vyatta-cfg-vpn-5ee99ec9d5cca8c13804964eee23ce0b15578edf.zip
vyatta-cfg-vpn: Properly implement force-encapsulation and fix descriptions
-rwxr-xr-xscripts/vpn-config.pl2
-rw-r--r--templates/vpn/ipsec/site-to-site/peer/node.tag/force-encapsulation/node.def4
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl
index 4267564..6a9063f 100755
--- a/scripts/vpn-config.pl
+++ b/scripts/vpn-config.pl
@@ -817,7 +817,7 @@ if ($vcVPN->exists('ipsec')) {
# Allow the user for force UDP encapsulation for the ESP
# payload.
#
- my $forceencaps = $vcVPN->returnValue("ipsec site-to-site $peer force-encapsulation");
+ my $forceencaps = $vcVPN->returnValue("ipsec site-to-site peer $peer force-encapsulation");
if (defined($forceencaps)) {
if ($forceencaps eq 'enable') {
$genout .= "\tforceencaps=yes\n";
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/force-encapsulation/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/force-encapsulation/node.def
index 0015add..bc71729 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/force-encapsulation/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/force-encapsulation/node.def
@@ -1,6 +1,6 @@
help: Force UDP Encapsulation for ESP Payloads
type: txt
syntax:expression: $VAR(@) in "enable", "disable"; "Must be enable or disable"
-val_help: enable; This endpoint will not force UDP encapsulation for this peer
-val_help: disable; This endpoint will force UDP encapsulation for this peer
+val_help: enable; This endpoint will force UDP encapsulation for this peer
+val_help: disable; This endpoint will not force UDP encapsulation for this peer