From 376e6f6719e6463913045b233ca90d69254057ff Mon Sep 17 00:00:00 2001
From: hamnur <hamnur@protonmail.com>
Date: Mon, 17 Jul 2017 14:14:59 +0200
Subject: Use attribute rekey_enable as usual but optionally allow to set
 margintime if rekeying is not disabled

---
 src/etc/inc/vpn.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/etc')

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') {
-- 
cgit v1.1