From: Adolf Belka Date: Sat, 24 Feb 2024 14:51:14 +0000 (+0100) Subject: dhcp.cgi: Fixes bug#11774 - allows dhcp option of array of integer 8 X-Git-Tag: v2.29-core185~150 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60a050768f1e3e4dd79c1696e249d426cdb9eab7;p=ipfire-2.x.git dhcp.cgi: Fixes bug#11774 - allows dhcp option of array of integer 8 - This v2 version is to correct the bug number. I entered a wronn bug number in the first version - This extends the allowed options from just array of ip-address to also include integer 8 or integer 16 or integer 32. - Tested out on vm testbed. The array of integer 8 (or 16 or 32) is acceptewd by the dhcp options section. I am not able to test out that the function actually works as I don't have any dhcp situation set up to use that capability. - Records or array of records is still not included. It was only an expansion of the array of section to include integers. Fixes: bug#11774 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer --- diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index c079fe1aee..be00f199a8 100644 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -48,7 +48,7 @@ my @nosaved=(); my %color = (); #Basic syntax allowed for new Option definition. Not implemented: RECORDS & array of RECORDS -our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of ip-address'; +our $OptionTypes = 'boolean|((un)?signed )?integer (8|16|32)|ip-address|text|string|encapsulate \w+|array of (ip-address|integer (8|16|32))'; &Header::showhttpheaders(); our @ITFs=('GREEN');