From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer <michael.tremer@ipfire.org> To: development@lists.ipfire.org Subject: Re: [PATCH] BUG11177: pppoe password not required anymore Date: Thu, 08 Sep 2016 12:59:09 +0100 Message-ID: <1473335949.2757.69.camel@ipfire.org> In-Reply-To: <1473316618-18264-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7291872019606458656==" List-Id: <development.lists.ipfire.org> --===============7291872019606458656== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Thanks. That was quick. On Thu, 2016-09-08 at 08:36 +0200, Alexander Marx wrote: > fixes: #11177 >=20 > There are providers which do not use passwords anymore. > For this reason the password field is no longer mandatory. >=20 > Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> > --- > =C2=A0html/cgi-bin/pppsetup.cgi | 7 ++----- > =C2=A01 file changed, 2 insertions(+), 5 deletions(-) >=20 > diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi > index 36d0ced..4b45ee5 100644 > --- a/html/cgi-bin/pppsetup.cgi > +++ b/html/cgi-bin/pppsetup.cgi > @@ -103,10 +103,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0if ($pppsettings{'USERNAME'} eq '') { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$e= rrormessage =3D $Lang::tr{'username not set'}; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0go= to ERROR; } > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0if ($pppsettings{'PASSWORD'} eq '') { > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0$erro= rmessage =3D $Lang::tr{'password not set'}; > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0goto = ERROR; } > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > + } > =C2=A0 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0if ($pppsettings{'TIM= EOUT'} eq '') { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0$errormessage =3D $Lang::tr{'idle timeout not set'= }; > @@ -927,7 +924,7 @@ print <<END > =C2=A0<tr> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<td width=3D'25%'>$La= ng::tr{'username'} <img src=3D'/blob.gif' > alt=3D'*' /></td> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<td width=3D'25%'><in= put type=3D'text' name=3D'USERNAME' > value=3D'$pppsettings{'USERNAME'}' /></td> > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<td width=3D'25%'>$Lang::t= r{'password'} <img src=3D'/blob.gif' > alt=3D'*' /></td> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<td width=3D'25%'>$Lang::t= r{'password'} </td> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0<td width=3D'25%'><in= put type=3D'password' name=3D'PASSWORD' > value=3D'$pppsettings{'PASSWORD'}' /></td> > =C2=A0</tr> > =C2=A0<tr> --===============7291872019606458656== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlgwVktOQUFvSkVJQjU4UDl2a0FrSFNIb1AvQStaRllaM0hMVGlNRmtvQ29FczVrTUMK TEF1VmVGYnRJdUx5T0dYeUZLaldYV3VFMDJrcTMyZnNadjhxVUR5OUxhUjF0cWl1eVVnNDlwMzlw V0RhRU1LZApCTU5DRGVvYUF4OTZXUUloaU1NTXVoU1lPcDdEcndTSE9weVdRZk85SXRkcGVXRWg4 TVloMlpEMWxwa1dna3U3Cm8rWE9GbDRYQ0VqZDRBbnJjaUVXWFZIN2cwWDVIZWVOYU5iNmUyMUVv cWdiVDIyWjdVenZlaEN2VjdoOW0zdXgKRExLOU56Vk91NFJKd013N1U3VGg2eHNRUitFOWt6bVdz Zmw5V2NoRTZLZ1g5eHl5b243aElFZjcxejV4NWM5bQpPVktIKzZndkhQRWdMbDZuOE0rQTArUzB3 ZjV6WkVMcHpra1BZOGoxSlFqeDR5eDFiTTJ2WHprOXp1dTcyZElkCkluV0wvZHcyTTVYejl5Z2I4 RGFIbFdsV1Brb2NybDIzMzV6M1Zid0p0b04xWDJvYUpqcmNyWEtLZ1Z1SzJ1aE8KK1RabzVZZVlh djlFbTRhRFBZWU44RDRkYWRTV3BSWUdQSEVRdWplS1BNTjl5K3hCQzFORHFDbVZmTWdIZXR5Kwp1 WlEzL0tKTGFZRWJPNU9GUklKRmtnb1pyTmVaRld0T2RzalNaOWxkaVNvMlB6OEl1eDZ0dVlZTmFE WnI4Vzh3Cmt2Vlh1VWY2VmdDZlE3Z1JJVjNUNitZeW5ESVUyTWlwbm4vVlltYnhlUk1ZWjV1KzB3 Tmt5RkFyVjdzYndYZkMKc2c2Z3dFZlBsOWlwV09SeWNHbWN6TWQ0bml1WWtrTTZCY2FOZXJsak5G cVphQlV5YzVqYTZDTkNUVmxUK3Y1awpQckx0S01SSjZUbVNpZWl4NHR1ZAo9c1E3OQotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============7291872019606458656==--