summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorManuel Munz <freifunk@somakoma.de>2011-02-12 19:39:54 +0000
committerManuel Munz <freifunk@somakoma.de>2011-02-12 19:39:54 +0000
commit489279bb9a4d9984315bc0e0f97a56fea800bbcd (patch)
tree1322b1b4058c7e6aa0c222161729242608bad4ef
parent4b0d5f9205de41d772e5f393123ceafed1c92c6c (diff)
web: Relax hostname validation for length
-rw-r--r--libs/web/htdocs/luci-static/resources/cbi.js2
-rw-r--r--libs/web/luasrc/cbi/datatypes.lua2
2 files changed, 2 insertions, 2 deletions
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