aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-03-18 23:34:06 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-03-18 23:34:06 +0000
commitd74c6ce7c5e0f1b4d929ca5e75a85c1e9bcf0015 (patch)
treee9dc3e8586dd3da5af58c3cbadeef086f1e71f71
parent6ac12fbb3cd08026f3f49b3d52043f6d510ab048 (diff)
downloadupstream-d74c6ce7c5e0f1b4d929ca5e75a85c1e9bcf0015.tar.gz
upstream-d74c6ce7c5e0f1b4d929ca5e75a85c1e9bcf0015.tar.bz2
upstream-d74c6ce7c5e0f1b4d929ca5e75a85c1e9bcf0015.zip
firewall: revert processing order of redirects and rules, ensures that rules can be used to filter before redirects are reached
SVN-Revision: 31014
-rw-r--r--package/firewall/Makefile2
-rw-r--r--package/firewall/files/lib/core.sh6
2 files changed, 4 insertions, 4 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 791edca4bb..373baae5f8 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall
PKG_VERSION:=2
-PKG_RELEASE:=48
+PKG_RELEASE:=49
include $(INCLUDE_DIR)/package.mk
diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index 0297518a5d..93d4d2e29b 100644
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -30,12 +30,12 @@ fw_start() {
echo "Loading forwardings"
config_foreach fw_load_forwarding forwarding
- echo "Loading redirects"
- config_foreach fw_load_redirect redirect
-
echo "Loading rules"
config_foreach fw_load_rule rule
+ echo "Loading redirects"
+ config_foreach fw_load_redirect redirect
+
echo "Loading includes"
config_foreach fw_load_include include