From 1a221ddfb9315a35af654363dde38650be5ad3d9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 11 Jul 2011 12:14:55 +0000 Subject: libs/core: fix multiple errors in zone delete handling of firewall model --- libs/core/luasrc/model/firewall.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs') 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) -- cgit v1.2.3