From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 3 May 2016 21:50:53 +0000 (+0100)
Subject: general-functions.pl: Allow underscores in domain names
X-Git-Tag: v2.19-core103~48^2~5
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=03306ff6a25238e01a1f2b39fbb929cf56615934

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 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;
 }