[v2] dhcp.cgi: Fixes bug#11774 - allows dhcp option of array of integer 8
Commit Message
- 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 <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
html/cgi-bin/dhcp.cgi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
Hi Bailey,
On 25/02/2024 13:28, Bailey Calder wrote:
> IPFire 2.29 (x86_64) - Core-Update 185 Development Build: next/d2991613
>
> Suricata fails to start from ssh and webgui
>
> [root@Bailey-Firewall ~]# suricata
> suricata: error while loading shared libraries: libelf.so.1: cannot open shared object file: No such file or directory
>
> is this a bug on my side or everyone else?
Looking through the git repo I have found that elfutils has not been shipped after being changed from an addon to a core package.
I have submitted a patch to ensure that the updated elfutils is shipped in CU185.
Any evaluations I have done using CU185 for evaluating bug fixes, package updates etc have all been done via a fresh install of CU185 when the updated elfutils is properly included.
Thanks for the heads up.
Regards,
Adolf.
>
> Thanks
> Bailey
Thank you. All merged :)
> On 26 Feb 2024, at 08:39, Adolf Belka <adolf.belka@ipfire.org> wrote:
>
> Hi Bailey,
>
> On 25/02/2024 13:28, Bailey Calder wrote:
>> IPFire 2.29 (x86_64) - Core-Update 185 Development Build: next/d2991613
>> Suricata fails to start from ssh and webgui
>> [root@Bailey-Firewall ~]# suricata
>> suricata: error while loading shared libraries: libelf.so.1: cannot open shared object file: No such file or directory
>> is this a bug on my side or everyone else?
> Looking through the git repo I have found that elfutils has not been shipped after being changed from an addon to a core package.
>
> I have submitted a patch to ensure that the updated elfutils is shipped in CU185.
>
>
> Any evaluations I have done using CU185 for evaluating bug fixes, package updates etc have all been done via a fresh install of CU185 when the updated elfutils is properly included.
>
> Thanks for the heads up.
>
> Regards,
> Adolf.
>> Thanks
>> Bailey
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2023 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2024 IPFire Team <info@ipfire.org> #
# #
# 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');