summaryrefslogtreecommitdiffstats
path: root/src/etc
diff options
context:
space:
mode:
authorhamnur <hamnur@protonmail.com>2017-07-17 14:14:59 +0200
committerhamnur <hamnur@protonmail.com>2017-07-17 14:14:59 +0200
commit376e6f6719e6463913045b233ca90d69254057ff (patch)
tree41a1e130971e2d5fc3713cf51dc6b240988b5ec0 /src/etc
parent9d472f01c31f2b56a95631dcd4f49e4685f55ea6 (diff)
downloadpfsense-376e6f6719e6463913045b233ca90d69254057ff.zip
pfsense-376e6f6719e6463913045b233ca90d69254057ff.tar.gz
Use attribute rekey_enable as usual but optionally allow to set margintime if rekeying is not disabled
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/inc/vpn.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index 1f2372a..6390aed 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -1109,11 +1109,13 @@ EOD;
$reauth = "reauth = yes";
}
- if ($ph1ent['margintime']) {
- $rekeyline = "rekey = yes";
- $rekeyline .= "\n\tmargintime = {$ph1ent['margintime']}s";
- } else {
+ if (isset($ph1ent['rekey_enable'])) {
$rekeyline = "rekey = no";
+ } else {
+ $rekeyline = "rekey = yes";
+ if(!empty($ph1ent['margintime'])){
+ $rekeyline .= "\n\tmargintime = {$ph1ent['margintime']}s";
+ }
}
if ($ph1ent['nat_traversal'] == 'off') {
OpenPOWER on IntegriCloud