Re: [PATCH] dhcp.cgi: Fix incorrect { placement from patch 3724

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1454 bytes --]

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:
> 
> - 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 validity
> check carried out on Default Lease Time if Deny Known Clients is not checked.
> - This patch moves the { bracket to the right location.
> 
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> html/cgi-bin/dhcp.cgi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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_ADDR_${itf}"}) eq '') {
> 			$errormessage = "DHCP on ${itf}: " . $Lang::tr{'dhcp valid range required when deny known clients checked'};
> 			goto ERROR;
> +		}
> 	    }
> 
> 	    if (!($dhcpsettings{"DEFAULT_LEASE_TIME_${itf}"} =~ /^\d+$/)) {
> 		$errormessage = "DHCP on ${itf}: " . $Lang::tr{'invalid default lease time'} . $dhcpsettings{'DEFAULT_LEASE_TIME_${itf}'};
> 		goto ERROR;
> -		}
> 	    }
> 
> 	    if (!($dhcpsettings{"MAX_LEASE_TIME_${itf}"} =~ /^\d+$/)) {
> -- 
> 2.30.1
>