From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 610108ffbd0ac539b6c43f1deb8d41e4b2053bef
Date: Mon, 30 Mar 2020 17:21:38 +0000
Message-ID: <48rfQB4ZNMz2yCm@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5745799196134442052=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============5745799196134442052==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  610108ffbd0ac539b6c43f1deb8d41e4b2053bef (commit)
      from  37533b0deabab9f1e44ac8d710c9cd6f1e4570f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 610108ffbd0ac539b6c43f1deb8d41e4b2053bef
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Mar 10 13:37:18 2020 +0000

    Fix accidentially reverted IKE lifetime limit to 24 hours
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/vpnmain.cgi | 2 +-
 langs/de/cgi-bin/de.pl   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 43cdc5aa0..bfa60d27d 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 =3D $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 =3D $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 fb676b868..c3702cc09 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1398,7 +1398,6 @@
 'ike integrity' =3D> 'IKE-Integrit=C3=A4t:',
 'ike lifetime' =3D> 'IKE-Lebensdauer:',
 'ike lifetime should be between 1 and 24 hours' =3D> 'IKE Lebensdauer sollte=
 zwischen 1 und 24 Stunden betragen.',
-'ike lifetime should be between 1 and 8 hours' =3D> 'Die IKE-Laufzeit sollte=
 zwischen einer und acht Stunden betragen',
 'imei' =3D> 'IMEI',
 'import' =3D> 'Import',
 'importkey' =3D> 'PSK importieren',


hooks/post-receive
--
IPFire 2.x development tree

--===============5745799196134442052==--