From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 10 Oct 2009 04:48:57 +0000 (+0000)
Subject: libs/core: fix firewall model
X-Git-Tag: 0.10.0~1097
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=0533309ef29e3ff3239d3fa2a8c561178137856e;p=project%2Fluci.git

libs/core: fix firewall model
---

diff --git a/libs/core/luasrc/model/firewall.lua b/libs/core/luasrc/model/firewall.lua
index 6fc207cac..a6158c205 100644
--- a/libs/core/luasrc/model/firewall.lua
+++ b/libs/core/luasrc/model/firewall.lua
@@ -74,21 +74,21 @@ function get_zones(self)
 	return zones
 end
 
-function get_zones_by_network(self, net)
-	local zones = { }
+function get_zone_by_network(self, net)
+	local z
 	ub.uci:foreach("firewall", "zone",
 		function(s)
-			if s.name then
+			if s.name and net then
 				local n
 				for _, n in ipairs(ub:list(s.network or s.name)) do
 					if n == net then
-						zones[#zones+1] = zone(s['.name'])
-						return true
+						z = s['.name']
+						return false
 					end
 				end
 			end
 		end)
-	return zones
+	return z and zone(z)
 end
 
 function del_zone(self, n)