summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorhamnur <hamnur@protonmail.com>2017-07-14 11:58:18 +0200
committerhamnur <hamnur@protonmail.com>2017-07-14 11:58:18 +0200
commite18ddb38449b6463fabf5782284b206a355dbad7 (patch)
tree469bf65afb9a0a44b2dcda3440c33374477679c7 /src/etc
parent1e0442e0612ecd289aa979bc945be0d8ead35f41 (diff)
downloadpfsense-e18ddb38449b6463fabf5782284b206a355dbad7.zip
pfsense-e18ddb38449b6463fabf5782284b206a355dbad7.tar.gz
Hide margintime if rekeying is disabled
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/vpn.inc15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index 9eaa6c0..1f2372a 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -985,10 +985,6 @@ EOD;
$ikelifeline = "ikelifetime = {$ph1ent['lifetime']}s";
}
- if ($ph1ent['rekeymargin']) {
- $rekeymargin = "rekeymargin = {$ph1ent['rekeymargin']}s";
- }
-
$rightsourceip = NULL;
if (isset($ph1ent['mobile'])) {
$rightsourceips = array();
@@ -1112,10 +1108,12 @@ EOD;
} else {
$reauth = "reauth = yes";
}
- if (isset($ph1ent['rekey_enable'])) {
- $rekey = "rekey = no";
+
+ if ($ph1ent['margintime']) {
+ $rekeyline = "rekey = yes";
+ $rekeyline .= "\n\tmargintime = {$ph1ent['margintime']}s";
} else {
- $rekey = "rekey = yes";
+ $rekeyline = "rekey = no";
}
if ($ph1ent['nat_traversal'] == 'off') {
@@ -1314,8 +1312,7 @@ EOD;
{$forceencaps}
{$mobike}
{$tfc}
- {$rekey}
- {$rekeymargin}
+ {$rekeyline}
installpolicy = yes
{$tunneltype}
{$dpdline}
OpenPOWER on IntegriCloud