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] dhcp.cgi: Fix incorrect { placement from patch 3724
Date: Tue, 16 Feb 2021 15:01:28 +0000
Message-ID: <B3719314-CD33-4736-9953-E01F3A7E58B3@ipfire.org>
In-Reply-To: <20210216133010.7645-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7626964947305752382=="
List-Id: <development.lists.ipfire.org>

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

Hello,

Is this something that needs to be pushed into master?

-Michael

> On 16 Feb 2021, at 13:30, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - When patch 3724 was created for bug #10743 a curly bracket was placed in =
the wrong place
> This results in the overlap of two if loops meaning that there will be no v=
alidity
> check carried out on Default Lease Time if Deny Known Clients is not checke=
d.
> - This patch moves the { bracket to the right location.
>=20
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> html/cgi-bin/dhcp.cgi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
> index 2ebdde818..867614f2a 100644
> --- a/html/cgi-bin/dhcp.cgi
> +++ b/html/cgi-bin/dhcp.cgi
> @@ -180,12 +180,12 @@ if ($dhcpsettings{'ACTION'} eq $Lang::tr{'save'}) {
> 		if (($dhcpsettings{"START_ADDR_${itf}"}) eq '' && ($dhcpsettings{"END_ADD=
R_${itf}"}) eq '') {
> 			$errormessage =3D "DHCP on ${itf}: " . $Lang::tr{'dhcp valid range requi=
red when deny known clients checked'};
> 			goto ERROR;
> +		}
> 	    }
>=20
> 	    if (!($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} =3D~ /^\d+$/)) {
> 		$errormessage =3D "DHCP on ${itf}: " . $Lang::tr{'invalid default lease t=
ime'} . $dhcpsettings{'DEFAULT_LEASE_TIME_${itf}'};
> 		goto ERROR;
> -		}
> 	    }
>=20
> 	    if (!($dhcpsettings{"MAX_LEASE_TIME_${itf}"} =3D~ /^\d+$/)) {
> --=20
> 2.30.1
>=20


--===============7626964947305752382==--