From: Jo-Philipp Wich Date: Sat, 7 Jan 2012 21:55:52 +0000 (+0000) Subject: applications/luci-firewall: fix datatype validation for masq src/dest; allow list... X-Git-Tag: 0.11.0~1186 X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=e4dc649e82edf5aac0668b901eaa1641b388f02c applications/luci-firewall: fix datatype validation for masq src/dest; allow list of negated ucinames, hostnames, ip-ranges or -addresses --- diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua index a8ae89441..0da146ace 100644 --- a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua +++ b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua @@ -2,6 +2,7 @@ LuCI - Lua Configuration Interface Copyright 2008 Steven Barth +Copyright 2010-2011 Jo-Philipp Wich Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -136,7 +137,7 @@ msrc = s:taboption("advanced", DynamicList, "masq_src", translate("Restrict Masquerading to given source subnets")) msrc.optional = true -msrc.datatype = "neg_network_ip4addr" +msrc.datatype = "list(neg,network)" msrc.placeholder = "0.0.0.0/0" msrc:depends("family", "") msrc:depends("family", "ipv4") @@ -145,7 +146,7 @@ mdest = s:taboption("advanced", DynamicList, "masq_dest", translate("Restrict Masquerading to given destination subnets")) mdest.optional = true -mdest.datatype = "neg_network_ip4addr" +mdest.datatype = "list(neg,network)" mdest.placeholder = "0.0.0.0/0" mdest:depends("family", "") mdest:depends("family", "ipv4")