From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2] dhcp.cgi: Fixes bug#11774 - allows dhcp option of array of
 integer 8
Date: Sat, 24 Feb 2024 15:51:14 +0100
Message-ID: <20240224145114.10418-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1698295454449116226=="
List-Id: <development.lists.ipfire.org>

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

- 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 incl=
ude
   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 work=
s 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(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/dhcp.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index c079fe1ae..be00f199a 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  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2024  IPFire Team  <info(a)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=3D();
 my %color =3D ();
=20
 #Basic syntax allowed for new Option definition. Not implemented: RECORDS & =
array of RECORDS
-our $OptionTypes =3D 'boolean|((un)?signed )?integer (8|16|32)|ip-address|te=
xt|string|encapsulate \w+|array of ip-address';
+our $OptionTypes =3D 'boolean|((un)?signed )?integer (8|16|32)|ip-address|te=
xt|string|encapsulate \w+|array of (ip-address|integer (8|16|32))';
=20
 &Header::showhttpheaders();
 our @ITFs=3D('GREEN');
--=20
2.44.0


--===============1698295454449116226==--