From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Mar 2020 13:37:18 +0000 (+0000)
Subject: Fix accidentially reverted IKE lifetime limit to 24 hours
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=610108ffbd0ac539b6c43f1deb8d41e4b2053bef;p=people%2Fpmueller%2Fipfire-2.x.git

Fix accidentially reverted IKE lifetime limit to 24 hours

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 43cdc5aa04..bfa60d27d1 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2384,7 +2384,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
 			$errormessage = $Lang::tr{'invalid input for ike lifetime'};
 			goto ADVANCED_ERROR;
 		}
-		if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 8) {
+		if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 24) {
 			$errormessage = $Lang::tr{'ike lifetime should be between 1 and 8 hours'};
 			goto ADVANCED_ERROR;
 		}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index fb676b8680..c3702cc098 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1398,7 +1398,6 @@
 'ike integrity' => 'IKE-Integrität:',
 'ike lifetime' => 'IKE-Lebensdauer:',
 'ike lifetime should be between 1 and 24 hours' => 'IKE Lebensdauer sollte zwischen 1 und 24 Stunden betragen.',
-'ike lifetime should be between 1 and 8 hours' => 'Die IKE-Laufzeit sollte zwischen einer und acht Stunden betragen',
 'imei' => 'IMEI',
 'import' => 'Import',
 'importkey' => 'PSK importieren',