[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 896fa74d68e83b344235dbd147b0e429aafb14d3

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 896fa74d68e83b344235dbd147b0e429aafb14d3

[Michael Tremer]

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  896fa74d68e83b344235dbd147b0e429aafb14d3 (commit)
      from  7c6a4babf851a13292f0cfa90ca9e3fbfc42525c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 896fa74d68e83b344235dbd147b0e429aafb14d3
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Tue Feb 16 14:30:10 2021 +0100

    dhcp.cgi: Fix incorrect { placement from patch 3724
    
    - 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>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/dhcp.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files:
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+$/)) {


hooks/post-receive
--
IPFire 2.x development tree