dhcp.cgi: Fixes bug#12070 - allows dhcp option of array of integer 8

Message ID 20240224143531.9122-1-adolf.belka@ipfire.org
State Superseded
Headers
Series dhcp.cgi: Fixes bug#12070 - allows dhcp option of array of integer 8 |

Commit Message

Adolf Belka Feb. 24, 2024, 2:35 p.m. UTC
  - 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#12070
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(-)
  

Patch

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@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');