From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] Fix accidentially reverted IKE lifetime limit to 24 hours Date: Tue, 10 Mar 2020 13:37:18 +0000 Message-ID: <20200310133718.25947-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4580836962553442430==" List-Id: --===============4580836962553442430== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- doc/language_issues.de | 1 - doc/language_issues.en | 2 +- doc/language_issues.es | 2 -- doc/language_issues.fr | 2 -- doc/language_issues.it | 2 -- doc/language_issues.nl | 2 -- doc/language_issues.pl | 2 -- doc/language_issues.ru | 2 -- doc/language_issues.tr | 2 -- html/cgi-bin/vpnmain.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 1 - 11 files changed, 3 insertions(+), 19 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index 361133708..aae1da012 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -360,7 +360,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in diff --git a/doc/language_issues.en b/doc/language_issues.en index 2fd69f430..6efc42719 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1061,7 +1061,7 @@ WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids working =3D Changes are being applied. Ple= ase wait until all operations have completed successfully... WARNING: untranslated string: iface =3D Iface WARNING: untranslated string: ignore filter =3D Ignore filter -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string +WARNING: untranslated string: ike lifetime should be between 1 and 24 hours = =3D IKE lifetime should be between 1 and 24 hours. WARNING: untranslated string: imei =3D IMEI WARNING: untranslated string: imsi =3D IMSI WARNING: untranslated string: inactive =3D inactive diff --git a/doc/language_issues.es b/doc/language_issues.es index af006fcdf..4f89a2bf3 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -311,7 +311,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -1121,7 +1120,6 @@ WARNING: untranslated string: ids ruleset autoupdate in= progress =3D Ruleset updat WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids working =3D Changes are being applied. Ple= ase wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: imei =3D IMEI WARNING: untranslated string: imsi =3D IMSI WARNING: untranslated string: incoming compression in bytes per second =3D I= ncoming Compression diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 3edee88df..a4ac4ecef 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -388,7 +388,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -845,7 +844,6 @@ WARNING: untranslated string: guardian logtarget_file =3D= unknown string WARNING: untranslated string: guardian logtarget_syslog =3D unknown string WARNING: untranslated string: guardian no entries =3D unknown string WARNING: untranslated string: guardian service =3D unknown string -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: info messages =3D unknown string WARNING: untranslated string: no data =3D unknown string WARNING: untranslated string: pakfire ago =3D ago. diff --git a/doc/language_issues.it b/doc/language_issues.it index 6471e0d41..e5c85551f 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -364,7 +364,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -964,7 +963,6 @@ WARNING: untranslated string: ids ruleset autoupdate in p= rogress =3D Ruleset updat WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids working =3D Changes are being applied. Ple= ase wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: incoming compression in bytes per second =3D I= ncoming Compression WARNING: untranslated string: incoming overhead in bytes per second =3D Inco= ming Overhead WARNING: untranslated string: info messages =3D unknown string diff --git a/doc/language_issues.nl b/doc/language_issues.nl index cc6cbe966..d5c3a0aea 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -360,7 +360,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -971,7 +970,6 @@ WARNING: untranslated string: ids ruleset autoupdate in p= rogress =3D Ruleset updat WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids working =3D Changes are being applied. Ple= ase wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: imei =3D IMEI WARNING: untranslated string: imsi =3D IMSI WARNING: untranslated string: incoming compression in bytes per second =3D I= ncoming Compression diff --git a/doc/language_issues.pl b/doc/language_issues.pl index af006fcdf..4f89a2bf3 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -311,7 +311,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -1121,7 +1120,6 @@ WARNING: untranslated string: ids ruleset autoupdate in= progress =3D Ruleset updat WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids working =3D Changes are being applied. Ple= ase wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: imei =3D IMEI WARNING: untranslated string: imsi =3D IMSI WARNING: untranslated string: incoming compression in bytes per second =3D I= ncoming Compression diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a8cdef8b4..21629f28a 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -304,7 +304,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -1122,7 +1121,6 @@ WARNING: untranslated string: ids ruleset autoupdate in= progress =3D Ruleset updat WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids working =3D Changes are being applied. Ple= ase wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: imei =3D IMEI WARNING: untranslated string: imsi =3D IMSI WARNING: untranslated string: incoming compression in bytes per second =3D I= ncoming Compression diff --git a/doc/language_issues.tr b/doc/language_issues.tr index c6c6ad599..cee9e768c 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -392,7 +392,6 @@ WARNING: translation string unused: ike encryption WARNING: translation string unused: ike grouptype WARNING: translation string unused: ike integrity WARNING: translation string unused: ike lifetime -WARNING: translation string unused: ike lifetime should be between 1 and 24 = hours WARNING: translation string unused: import WARNING: translation string unused: importkey WARNING: translation string unused: in @@ -895,7 +894,6 @@ WARNING: untranslated string: ids ruleset autoupdate in p= rogress =3D Ruleset updat WARNING: untranslated string: ids ruleset settings =3D Ruleset Settings WARNING: untranslated string: ids show =3D Show WARNING: untranslated string: ids working =3D Changes are being applied. Ple= ase wait until all operations have completed successfully... -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = =3D unknown string WARNING: untranslated string: info messages =3D unknown string WARNING: untranslated string: interface mode =3D Interface WARNING: untranslated string: invalid input for interface address =3D Invali= d input for interface address diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 43cdc5aa0..e0f2c7a5e 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2384,8 +2384,8 @@ 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) { - $errormessage =3D $Lang::tr{'ike lifetime should be between 1 and 8 hours= '}; + if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 24) { + $errormessage =3D $Lang::tr{'ike lifetime should be between 1 and 24 hour= s'}; goto ADVANCED_ERROR; } @temp =3D split('\|', $cgiparams{'ESP_ENCRYPTION'}); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 80579e7cc..1b1f52e22 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1369,7 +1369,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', --=20 2.20.1 --===============4580836962553442430==--