From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 2 Nov 2011 19:13:50 +0000 (+0000)
Subject: luci-0.10: merge r7872
X-Git-Tag: 0.10.0~51
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=271faba4db92e1e1668cf49ba6e915c73ff564a9;p=oweals%2Fluci.git

luci-0.10: merge r7872
---

diff --git a/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua b/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
index f14434dd8..d59d2331d 100644
--- a/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
+++ b/protocols/3g/luasrc/model/cbi/admin_network/proto_3g.lua
@@ -97,6 +97,7 @@ dns = section:taboption("advanced", DynamicList, "dns",
 
 dns:depends("peerdns", "")
 dns.datatype = "ipaddr"
+dns.cast     = "string"
 
 
 keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua b/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
index 806d5cd31..68c32f2ea 100644
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
+++ b/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
@@ -88,6 +88,7 @@ dns = section:taboption("advanced", DynamicList, "dns",
 
 dns:depends("_no_dns", "")
 dns.datatype = "ipaddr"
+dns.cast     = "string"
 
 
 metric = section:taboption("advanced", Value, "metric",
diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua b/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
index 3c9b14b2b..7c9d8e8f3 100644
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
+++ b/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua
@@ -42,6 +42,7 @@ dns = section:taboption("general", DynamicList, "dns",
 	translate("Use custom DNS servers"))
 
 dns.datatype = "ipaddr"
+dns.cast     = "string"
 
 
 if luci.model.network:has_ipv6() then
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua b/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
index 6cbdd9953..e2e44fa4c 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
+++ b/protocols/ppp/luasrc/model/cbi/admin_network/proto_ppp.lua
@@ -75,6 +75,7 @@ dns = section:taboption("advanced", DynamicList, "dns",
 
 dns:depends("peerdns", "")
 dns.datatype = "ipaddr"
+dns.cast     = "string"
 
 
 keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
index 9bc956a79..1e99c25a6 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
+++ b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoa.lua
@@ -81,6 +81,7 @@ dns = section:taboption("advanced", DynamicList, "dns",
 
 dns:depends("peerdns", "")
 dns.datatype = "ipaddr"
+dns.cast     = "string"
 
 
 keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
index 6a5d3c362..72df0e43c 100644
--- a/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
+++ b/protocols/ppp/luasrc/model/cbi/admin_network/proto_pppoe.lua
@@ -75,6 +75,7 @@ dns = section:taboption("advanced", DynamicList, "dns",
 
 dns:depends("peerdns", "")
 dns.datatype = "ipaddr"
+dns.cast     = "string"
 
 
 keepalive_failure = section:taboption("advanced", Value, "_keepalive_failure",
diff --git a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua b/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
index 0d7ca3e4c..fb8a9ac8a 100644
--- a/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
+++ b/protocols/pptp/luasrc/model/cbi/admin_network/proto_pptp.lua
@@ -58,3 +58,4 @@ dns = section:taboption("advanced", DynamicList, "dns",
 
 dns:depends("peerdns", "")
 dns.datatype = "ipaddr"
+dns.cast     = "string"