From 03306ff6a25238e01a1f2b39fbb929cf56615934 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 3 May 2016 22:50:53 +0100 Subject: [PATCH] general-functions.pl: Allow underscores in domain names Signed-off-by: Michael Tremer --- config/cfgroot/general-functions.pl | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index f3a2e4723b..d3d725131f 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -633,15 +633,10 @@ sub validdomainname # Each part should be no more than 63 characters in length if (length ($part) < 1 || length ($part) > 63) { return 0;} - # Only valid characters are a-z, A-Z, 0-9 and - - if ($part !~ /^[a-zA-Z0-9-]*$/) { - return 0;} - # First character can only be a letter or a digit - if (substr ($part, 0, 1) !~ /^[a-zA-Z0-9]*$/) { - return 0;} - # Last character can only be a letter or a digit - if (substr ($part, -1, 1) !~ /^[a-zA-Z0-9]*$/) { - return 0;} + # Only valid characters are a-z, A-Z, 0-9, _ and - + if ($part !~ /^[a-zA-Z0-9_-]*$/) { + return 0; + } } return 1; } -- 2.39.2