[backfire] firewall: merge r28535

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28536 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index df49d1df787e170babd2404907064a8e00833ff2..5978068fc593cfef093ae6cdf3b05e01233d6c77 100644 (file)
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
 PKG_NAME:=firewall
 
 PKG_VERSION:=2

-PKG_RELEASE:=34.3
+PKG_RELEASE:=34.4

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/firewall/files/lib/fw.sh b/package/firewall/files/lib/fw.sh
index a8a791149478badda041dd01c1fa36179afc6428..7922d222f8da6e38b0529cac06eeb64de411780b 100644 (file)
--- a/package/firewall/files/lib/fw.sh
+++ b/package/firewall/files/lib/fw.sh
@@ -74,7 +74,8 @@ fw__exec() { # <action> <family> <table> <chain> <target> <position> { <rules> }
                        fw__rc $(($? & 1))
                        return
                fi
                        fw__rc $(($? & 1))
                        return
                fi

-               fw__rc 0
+               [ "$app" != ip6tables ] || [ "$tab" != nat ]
+               fw__rc $?

        }
 
        fw__err() {
        }
 
        fw__err() {