From f57a228c4bed2b7f680b929a511634d21f2007e6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 19 Jan 2015 17:04:37 +0100 Subject: [PATCH] ipsec: Allow IKE lifetime of up to 24 hours Requested in #10722 The recommended time has not been changed, but it is often stated that 24 hours is a common lifetime for IKE. --- html/cgi-bin/vpnmain.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 2 +- langs/es/cgi-bin/es.pl | 2 +- langs/fr/cgi-bin/fr.pl | 2 +- langs/it/cgi-bin/it.pl | 2 +- langs/nl/cgi-bin/nl.pl | 2 +- langs/pl/cgi-bin/pl.pl | 2 +- langs/ru/cgi-bin/ru.pl | 2 +- langs/tr/cgi-bin/tr.pl | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index f5ec50079a..380ae2686d 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -2168,8 +2168,8 @@ 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) { - $errormessage = $Lang::tr{'ike lifetime should be between 1 and 8 hours'}; + if ($cgiparams{'IKE_LIFETIME'} < 1 || $cgiparams{'IKE_LIFETIME'} > 24) { + $errormessage = $Lang::tr{'ike lifetime should be between 1 and 24 hours'}; goto ADVANCED_ERROR; } @temp = split('\|', $cgiparams{'ESP_ENCRYPTION'}); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 7ad94f5077..eb29b5fbf2 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1232,7 +1232,7 @@ 'ike grouptype' => 'IKE Gruppentyp:', 'ike integrity' => 'IKE Integrität:', 'ike lifetime' => 'IKE Lebensdauer:', -'ike lifetime should be between 1 and 8 hours' => 'IKE Lebensdauer sollte zwischen 1 und 8 Stunden betragen.', +'ike lifetime should be between 1 and 24 hours' => 'IKE Lebensdauer sollte zwischen 1 und 24 Stunden betragen.', 'imei' => 'IMEI', 'import' => 'Import', 'importkey' => 'PSK importieren', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d34e6c7da2..8c049fffa9 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1261,7 +1261,7 @@ 'ike grouptype' => 'IKE Grouptype:', 'ike integrity' => 'IKE Integrity:', 'ike lifetime' => 'IKE Lifetime:', -'ike lifetime should be between 1 and 8 hours' => 'IKE lifetime should be between 1 and 8 hours.', +'ike lifetime should be between 1 and 24 hours' => 'IKE lifetime should be between 1 and 24 hours.', 'imei' => 'IMEI', 'import' => 'Import', 'importkey' => 'Import PSK', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 8c757a9b39..b7c50ff108 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -934,7 +934,7 @@ 'ike grouptype' => 'Tipo de grupo IKE:', 'ike integrity' => 'Integridad IKE:', 'ike lifetime' => 'Tiempo de vida IKE:', -'ike lifetime should be between 1 and 8 hours' => 'Tiempo de vida IKE entre 1 y 8 horas.', +'ike lifetime should be between 1 and 24 hours' => 'Tiempo de vida IKE entre 1 y 24 horas.', 'import' => 'Importar', 'importkey' => 'Importar PSK', 'in' => 'En', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index ccd61cb407..8b4d63aded 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -935,7 +935,7 @@ 'ike grouptype' => 'Type de groupe IKE :', 'ike integrity' => 'Intégrité IKE :', 'ike lifetime' => 'Durée de vie IKE :', -'ike lifetime should be between 1 and 8 hours' => 'La durée de vie IKE devrait être comprise entre 1 et 8 heures.', +'ike lifetime should be between 1 and 24 hours' => 'La durée de vie IKE devrait être comprise entre 1 et 8 heures.', 'import' => 'Importer', 'importkey' => 'Importer PSK', 'in' => 'Dans', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 0b5e7868cb..4fde313762 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1247,7 +1247,7 @@ 'ike grouptype' => 'IKE Grouptype:', 'ike integrity' => 'IKE Integrity:', 'ike lifetime' => 'IKE Lifetime:', -'ike lifetime should be between 1 and 8 hours' => 'IKE lifetime should be between 1 and 8 hours.', +'ike lifetime should be between 1 and 24 hours' => 'IKE lifetime should be between 1 and 24 hours.', 'imei' => 'IMEI', 'import' => 'Import', 'importkey' => 'Import PSK', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index fdad1d3abd..7468eb9162 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1227,7 +1227,7 @@ 'ike grouptype' => 'IKE Groepstype:', 'ike integrity' => 'IKE Integriteit:', 'ike lifetime' => 'IKE Levensduur:', -'ike lifetime should be between 1 and 8 hours' => 'IKE levensduur moet tussen 1 en 8 uur liggen.', +'ike lifetime should be between 1 and 24 hours' => 'IKE levensduur moet tussen 1 en 24 uur liggen.', 'import' => 'Importeer', 'importkey' => 'Importeer PSK', 'in' => 'In', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 5a205e1dee..02fb531cf4 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -943,7 +943,7 @@ 'ike grouptype' => 'Typ grupy IKE:', 'ike integrity' => 'Spójność IKE:', 'ike lifetime' => 'Czas ważności IKE:', -'ike lifetime should be between 1 and 8 hours' => 'Czas ważności IKE powinien wynosić od 1 do 8 godzin.', +'ike lifetime should be between 1 and 24 hours' => 'Czas ważności IKE powinien wynosić od 1 do 24 godzin.', 'import' => 'Import', 'importkey' => 'Import PSK', 'in' => 'W', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 38b844169e..a2a3693884 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -937,7 +937,7 @@ 'ike grouptype' => 'IKE Grouptype:', 'ike integrity' => 'IKE Integrity:', 'ike lifetime' => 'IKE Lifetime:', -'ike lifetime should be between 1 and 8 hours' => 'IKE lifetime should be between 1 and 8 hours.', +'ike lifetime should be between 1 and 24 hours' => 'IKE lifetime should be between 1 and 24 hours.', 'import' => 'Import', 'importkey' => 'Import PSK', 'in' => 'In', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index ca199bfad7..89f753ed6d 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1261,7 +1261,7 @@ 'ike grouptype' => 'IKE Grup Türü:', 'ike integrity' => 'IKE Bütünlüğü:', 'ike lifetime' => 'IKE Yaşam Süresi:', -'ike lifetime should be between 1 and 8 hours' => 'IKE yaşam süresi 1 ila 8 saat arasında olmalıdır.', +'ike lifetime should be between 1 and 24 hours' => 'IKE yaşam süresi 1 ila 24 saat arasında olmalıdır.', 'imei' => 'IMEI', 'import' => 'Al', 'importkey' => 'PSK Al', -- 2.39.2