From: Manuel Munz <freifunk@somakoma.de>
Date: Sat, 12 Feb 2011 19:41:38 +0000 (+0000)
Subject: luci-0.10: Merge r6887
X-Git-Tag: 0.10.0~180
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a6f83e195d06ff48ef6621e9b85b338d63d93d49;p=oweals%2Fluci.git

luci-0.10: Merge r6887
---

diff --git a/libs/web/htdocs/luci-static/resources/cbi.js b/libs/web/htdocs/luci-static/resources/cbi.js
index d12d050a8..2bcfb8c3d 100644
--- a/libs/web/htdocs/luci-static/resources/cbi.js
+++ b/libs/web/htdocs/luci-static/resources/cbi.js
@@ -141,7 +141,7 @@ var cbi_validators = {
 	},
 
 	'hostname': function(v)
-	{	if ( v.length <= 24 )
+	{	if ( v.length <= 253 )
 			return (v.match(/^[a-zA-Z0-9][a-zA-Z0-9\-.]*[a-zA-Z0-9]$/) != null);
 	},
 
diff --git a/libs/web/luasrc/cbi/datatypes.lua b/libs/web/luasrc/cbi/datatypes.lua
index d1ac8f405..58b54de6e 100644
--- a/libs/web/luasrc/cbi/datatypes.lua
+++ b/libs/web/luasrc/cbi/datatypes.lua
@@ -127,7 +127,7 @@ function macaddr(val)
 end
 
 function hostname(val)
-	if val and (#val < 25) and val.match(val, "^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$") then
+	if val and (#val < 254) and val.match(val, "^[a-zA-Z0-9][a-zA-Z0-9%-%.]*[a-zA-Z0-9]$") then
 		return true
 	end
 	return false