From mboxrd@z Thu Jan 1 00:00:00 1970 From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH v2] OpenVPN: max-clients value has been enhanced Date: Mon, 10 Aug 2020 19:12:19 +0200 Message-ID: <20200810171219.1364-1-ummeegge@ipfire.org> In-Reply-To: <51808fb02046e2fb84914bd63680f2c2cbe4f010.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1740879449141510524==" List-Id: --===============1740879449141510524== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The --max-client value has been enhanced from 255 clients to 1024 clients. Error message gives now explanation if the maximum has been reached. Patch has been triggered by https://community.ipfire.org/t/openvpn-max-vpn-cl= ients-quantity-and-connections/2925 . Signed-off-by: Erik Kapfer --- html/cgi-bin/ovpnmain.cgi | 2 +- 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, 10 insertions(+), 10 deletions(-) diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 457ebcf1f..e80ee23a7 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -890,7 +890,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}= ) { undef $vpnsettings{'ROUTES_PUSH'}; &write_routepushfile; } - if ((length($cgiparams{'MAX_CLIENTS'}) =3D=3D 0) || (($cgiparams{'MAX_CL= IENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 255 )) { + if ((length($cgiparams{'MAX_CLIENTS'}) =3D=3D 0) || (($cgiparams{'MAX_CL= IENTS'}) < 1 ) || (($cgiparams{'MAX_CLIENTS'}) > 1024 )) { $errormessage =3D $Lang::tr{'invalid input for max clients'}; goto ADV_ERROR; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index b01e75eb5..bcea33320 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1457,7 +1457,7 @@ 'invalid input for keepalive 1:2' =3D> 'Ung=C3=BCltige Eingabe f=C3=BCr Keep= alive (mindestens ein Verh=C3=A4ltnis von 1:2)', 'invalid input for keepalive 2' =3D> 'Ung=C3=BCltige Eingabe f=C3=BCr Keepal= ive ping-restart', 'invalid input for local ip address' =3D> 'Ung=C3=BCltige Eingabe f=C3=BCr d= ie lokale IP-Adresse', -'invalid input for max clients' =3D> 'Ung=C3=BCltige Eingabe f=C3=BCr Max Cl= ients', +'invalid input for max clients' =3D> 'Ung=C3=BCltige Eingabe f=C3=BCr Max Cl= ients. Das Maximum von 1024 Clients wurde =C3=BCberschritten', 'invalid input for mode' =3D> 'Ung=C3=BCltige Eingabe des Modus', 'invalid input for name' =3D> 'Ung=C3=BCltige Eingabe f=C3=BCr vollen Namen = des Benutzers oder des System Hostnamens', 'invalid input for oink code' =3D> 'Ung=C3=BCltige Eingabe f=C3=BCr Oink Cod= e', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7e3bbec89..95ee46393 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1481,7 +1481,7 @@ 'invalid input for keepalive 1:2' =3D> 'Invalid input for Keepalive use at l= east a ratio of 1:2', 'invalid input for keepalive 2' =3D> 'Invalid input for Keepalive ping-resta= rt', 'invalid input for local ip address' =3D> 'Invalid input for local IP addres= s', -'invalid input for max clients' =3D> 'Invalid input for Max Clients', +'invalid input for max clients' =3D> 'Invalid input for Max Clients. The max= imum of 1024 clients has been exceeded', 'invalid input for mode' =3D> 'Invalid input for mode', 'invalid input for name' =3D> 'Invalid input for user\'s full name or system= hostname', 'invalid input for oink code' =3D> 'Invalid input for Oink code', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index c75a47324..8a611e181 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -980,7 +980,7 @@ 'invalid input for keepalive 1' =3D> 'Entrada no v=C3=A1lida para ping Keepa= live', 'invalid input for keepalive 1:2' =3D> 'Entrada no v=C3=A1lida para Keepaliv= e, use por lo menos una relaci=C3=B3n 1:2', 'invalid input for keepalive 2' =3D> 'Entrada no v=C3=A1lida para reinicio d= e ping Keepalive', -'invalid input for max clients' =3D> 'Entrada no v=C3=A1lida para M=C3=A1xim= o n=C3=BAmero de Clientes', +'invalid input for max clients' =3D> 'Entrada no v=C3=A1lida para M=C3=A1xim= o n=C3=BAmero de Clientes. Se super=C3=B3 el m=C3=A1ximo de 1024 clientes.', 'invalid input for name' =3D> 'Entrada no v=C3=A1lida para nombre completo d= e usuario o nombre de host del sistema', 'invalid input for oink code' =3D> 'Entrada no v=C3=A1lida para c=C3=B3digo = Oink', 'invalid input for organization' =3D> 'Entrada no v=C3=A1lida para organizac= i=C3=B3n', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index d9930230f..fc19257bf 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1487,7 +1487,7 @@ 'invalid input for keepalive 1:2' =3D> 'Keepalive non valide, utilisez au mi= nimum un ratio de 1:2', 'invalid input for keepalive 2' =3D> 'Red=C3=A9marrage ping keepalive non va= lide', 'invalid input for local ip address' =3D> 'Entr=C3=A9e non valide pour l\'ad= resse IP locale', -'invalid input for max clients' =3D> 'Nombre de clients maximum non valide', +'invalid input for max clients' =3D> 'Nombre de clients maximum non valide. = Le maximum de 1024 clients a =C3=A9t=C3=A9 d=C3=A9pass=C3=A9.', 'invalid input for mode' =3D> 'Entr=C3=A9e non valide pour le mode', 'invalid input for name' =3D> 'Mauvaise saisie pour le nom d\'utilisateur ou= le nom d\'h=C3=B4te du syst=C3=A8me', 'invalid input for oink code' =3D> 'Oink code non valide', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 6c9137c28..fa4591b67 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1298,7 +1298,7 @@ 'invalid input for keepalive 1' =3D> 'Invalid input for Keepalive ping', 'invalid input for keepalive 1:2' =3D> 'Invalid input for Keepalive use at l= east a ratio of 1:2', 'invalid input for keepalive 2' =3D> 'Invalid input for Keepalive ping-resta= rt', -'invalid input for max clients' =3D> 'Invalid input for Max Clients', +'invalid input for max clients' =3D> 'Invalid input for Max Clients. =C3=88 = stato superato il massimo di 1024 client.', 'invalid input for name' =3D> 'Invalid input for user\'s full name or system= hostname', 'invalid input for oink code' =3D> 'Invalid input for Oink code', 'invalid input for organization' =3D> 'Invalid input for organization', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 5fa89b1ac..4be11d5c1 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1277,7 +1277,7 @@ 'invalid input for keepalive 1' =3D> ' Ongeldige invoer voor keepalive ping', 'invalid input for keepalive 1:2' =3D> ' Ongeldige invoer voor keepalive geb= ruik tenminste een ratio van 1:2', 'invalid input for keepalive 2' =3D> ' Ongeldige invoer voor keepalive ping-= herstart', -'invalid input for max clients' =3D> ' Ongeldige invoer voor max. clients', +'invalid input for max clients' =3D> ' Ongeldige invoer voor max. clients. H= et maximum van 1024 clients is overschreden.', 'invalid input for name' =3D> ' Ongeldige invoer voor gebruikersnaam of syst= eemhostnaam', 'invalid input for oink code' =3D> ' Ongeldige invoer voor Oink code', 'invalid input for organization' =3D> ' Ongeldige invoer voor organisatie', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 521381af2..e77120273 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -989,7 +989,7 @@ 'invalid input for keepalive 1' =3D> 'Niepoprawna warto=C5=9B=C4=87 w polu K= eepalive ping', 'invalid input for keepalive 1:2' =3D> 'Niepoprawna warto=C5=9B=C4=87 w polu= Keepalive. U=C5=BCywaj min. wsp=C3=B3=C5=82czynnika 1:2', 'invalid input for keepalive 2' =3D> 'Niepoprawna warto=C5=9B=C4=87 w polu K= eepalive ping-restart', -'invalid input for max clients' =3D> 'Niepoprawna warto=C5=9B=C4=87 w polu M= ax Klient=C3=B3w', +'invalid input for max clients' =3D> 'Niepoprawna warto=C5=9B=C4=87 w polu M= ax Klient=C3=B3w. Przekroczono maksymaln=C4=85 liczb=C4=99 1024 klient=C3=B3w= .', 'invalid input for name' =3D> 'Niepoprawna warto=C5=9B=C4=87 w polu pe=C5=82= na nazwa u=C5=BCytkownika lub nazwa hosta systemu', 'invalid input for oink code' =3D> 'Niepoprawny OINKCODE', 'invalid input for organization' =3D> 'Niepoprawna warto=C5=9B=C4=87 w polu = organizacja', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 9ac46d459..29e6b5f93 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -982,7 +982,7 @@ 'invalid input for keepalive 1' =3D> '=D0=9D=D0=B5=D0=B2=D0=B5=D1=80=D0=BD= =D0=BE =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD Keepalive ping.', 'invalid input for keepalive 1:2' =3D> 'Invalid input for Keepalive use at l= east a ratio of 1:2.', 'invalid input for keepalive 2' =3D> '=D0=9D=D0=B5=D0=B2=D0=B5=D1=80=D0=BD= =D0=BE =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD Keepalive ping-restart.', -'invalid input for max clients' =3D> '=D0=9D=D0=B5=D0=B2=D0=B5=D1=80=D0=BD= =D0=BE =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=BE =D0=BC=D0=B0=D0=BA=D1=81=D0= =B8=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5 =D1=87=D0=B8=D1=81=D0=BB=D0=BE = =D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=BE=D0=B2.', +'invalid input for max clients' =3D> '=D0=9D=D0=B5=D0=B2=D0=B5=D1=80=D0=BD= =D0=BE =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=BE =D0=BC=D0=B0=D0=BA=D1=81=D0= =B8=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B5 =D1=87=D0=B8=D1=81=D0=BB=D0=BE = =D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=BE=D0=B2. =D0=9F=D1=80=D0=B5=D0=B2=D1= =8B=D1=88=D0=B5=D0=BD=D0=BE =D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=D0=B0=D0=BB= =D1=8C=D0=BD=D0=BE 1024 =D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82=D0=BE=D0=B2.', 'invalid input for name' =3D> '=D0=9D=D0=B5=D0=B2=D0=B5=D1=80=D0=BD=D0=BE = =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=BE =D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D0= =B5 =D0=B8=D0=BC=D1=8F =D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82= =D0=B5=D0=BB=D1=8F =D0=B8=D0=BB=D0=B8 =D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0= =BD=D0=BE=D0=B5 =D0=B8=D0=BC=D1=8F =D1=85=D0=BE=D1=81=D1=82=D0=B0.', 'invalid input for oink code' =3D> '=D0=9D=D0=B5=D0=B2=D0=B5=D1=80=D0=BD=D0= =BE =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD Oink code', 'invalid input for organization' =3D> '=D0=9D=D0=B5=D0=B2=D0=B5=D1=80=D0=BD= =D0=BE =D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B0 =D0=BE=D1=80=D0=B3=D0=B0=D0= =BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index c23ff5df6..ea2047609 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1415,7 +1415,7 @@ 'invalid input for keepalive 1' =3D> 'Ping komutunu canl=C4=B1 tutma i=C3=A7= in ge=C3=A7ersiz giri=C5=9F.', 'invalid input for keepalive 1:2' =3D> '1:2 oran=C4=B1nda, en az bir oran=C4= =B1 canl=C4=B1 tutma kullan=C4=B1m i=C3=A7in ge=C3=A7ersiz giri=C5=9F', 'invalid input for keepalive 2' =3D> 'Ping komutunu yeniden ba=C5=9Flatmada = canl=C4=B1 tutmak i=C3=A7in ge=C3=A7ersiz giri=C5=9F.', -'invalid input for max clients' =3D> 'En fazla istemci i=C3=A7in ge=C3=A7ers= iz giri=C5=9F.', +'invalid input for max clients' =3D> 'En fazla istemci i=C3=A7in ge=C3=A7ers= iz giri=C5=9F. Maksimum 1024 m=C3=BC=C5=9Fteri a=C5=9F=C4=B1ld=C4=B1.', 'invalid input for name' =3D> 'Kullan=C4=B1c=C4=B1n=C4=B1n tam ad=C4=B1 veya= sistem ana bilgisayar ad=C4=B1 i=C3=A7in ge=C3=A7ersiz giri=C5=9F', 'invalid input for oink code' =3D> 'Oink kodu i=C3=A7in ge=C3=A7ersiz giri= =C5=9F.', 'invalid input for organization' =3D> 'Kurulu=C5=9F i=C3=A7in ge=C3=A7ersiz = giri=C5=9F.', --=20 2.12.2 --===============1740879449141510524==--