From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] general-functions.pl: Fix for bug #12865 - Static IP address pools - Add network - Name wit> Date: Fri, 24 Jun 2022 23:58:57 +0200 Message-ID: <20220624215857.3518119-2-adolf.belka@ipfire.org> In-Reply-To: <20220624215857.3518119-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1988279354412092689==" List-Id: --===============1988279354412092689== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - The fix for bug #12428 removed spaces from the validhostname subroutine as = hostnames are not supposed to have spaces - This resulted in spaces no longer being allowed for the Static IP Address P= ools names - New subroutine created called validccdname. This allows letters, upper and = lower case, numbers, spaces and dashes Fixes: Bug #12865 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/cfgroot/general-functions.pl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-fun= ctions.pl index 6f49585dc..16a05cecf 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -721,6 +721,21 @@ sub validhostname return 1; } =20 +sub validccdname +{ + # Checks a ccdname for letters, numbers and spaces + my $ccdname =3D $_[0]; + + # ccdname should be at least one character in length + # but no more than 63 characters + if (length ($ccdname) < 1 || length ($ccdname) > 63) { + return 0;} + # Only valid characters are a-z, A-Z, 0-9, space and - + if ($ccdname !~ /^[a-zA-Z0-9 -]*$/) { + return 0;} + return 1; +} + sub validdomainname { my $part; --=20 2.36.1 --===============1988279354412092689==--