general-functions.pl: Fix for bug #12865 - Static IP address pools - Add network - Name wit>

- 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 Pools names
- New subroutine created called validccdname. This allows letters, upper and lower case,
   numbers, spaces and dashes

Fixes: Bug #12865
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
This commit is contained in:
Adolf Belka
2022-06-24 23:58:57 +02:00
committed by Peter Müller
parent dcc2f7e0f2
commit 0b4618f9a3

View File

@@ -721,6 +721,21 @@ sub validhostname
return 1;
}
sub validccdname
{
# Checks a ccdname for letters, numbers and spaces
my $ccdname = $_[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;