general-functions.pl: Allow underscores in domain names

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index f3a2e4723b26eef838a60102dcb11519ade4b396..d3d725131f5be2822652a2b02ac694dda3cef9c1 100644 (file)
--- 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;
 }