From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 11 Jul 2011 12:17:46 +0000 (+0000)
Subject: luci-0.10: merge r7266
X-Git-Tag: 0.10.0~104
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=deb69053141ec0355662f224593cfeb35df8f0a0;p=oweals%2Fluci.git

luci-0.10: merge r7266
---

diff --git a/libs/core/luasrc/model/firewall.lua b/libs/core/luasrc/model/firewall.lua
index c4904eba8..0c574e0f7 100644
--- a/libs/core/luasrc/model/firewall.lua
+++ b/libs/core/luasrc/model/firewall.lua
@@ -154,7 +154,7 @@ function del_zone(self, n)
 
 	if uci_r:get("firewall", n) == "zone" then
 		local z = uci_r:get("firewall", n, "name")
-		r = uci_r:delete("firwall", n)
+		r = uci_r:delete("firewall", n)
 		n = z
 	else
 		uci_r:foreach("firewall", "zone",
@@ -176,14 +176,14 @@ function del_zone(self, n)
 
 		uci_r:foreach("firewall", "redirect",
 			function(s)
-				if s.src == n then
+				if s.src == n or s.dest == n then
 					uci_r:delete("firewall", s['.name'])
 				end
 			end)
 
 		uci_r:foreach("firewall", "forwarding",
 			function(s)
-				if s.src == n then
+				if s.src == n or s.dest == n then
 					uci_r:delete("firewall", s['.name'])
 				end
 			end)