aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-03-01 18:04:14 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-03-01 18:04:14 +0000
commit1ca64678bbb0eff352c6624cf7bf77f57f494bc9 (patch)
tree9ef865bc2f8429ba302dda7f8125f5ec1425e306
parenta37fc00aef54b253073063756a39971fdbf6e8c3 (diff)
downloadupstream-1ca64678bbb0eff352c6624cf7bf77f57f494bc9.tar.gz
upstream-1ca64678bbb0eff352c6624cf7bf77f57f494bc9.tar.bz2
upstream-1ca64678bbb0eff352c6624cf7bf77f57f494bc9.zip
firewall: fix rule generation for v4 or v6 only zones (#8955)
SVN-Revision: 25813
-rw-r--r--package/firewall/Makefile4
-rw-r--r--package/firewall/files/lib/core_interface.sh3
2 files changed, 5 insertions, 2 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 4a8a5d3199..3d61e09889 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall
PKG_VERSION:=2
-PKG_RELEASE:=21
+PKG_RELEASE:=22
include $(INCLUDE_DIR)/package.mk
diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh
index f08975952c..aff6641807 100644
--- a/package/firewall/files/lib/core_interface.sh
+++ b/package/firewall/files/lib/core_interface.sh
@@ -70,6 +70,9 @@ fw_configure_interface() {
# Need v4 while zone is v6
*/*.*) fw_log info "zone $zone does not support IPv4 address family, skipping"; return ;;
+
+ # Strip prefix
+ *) mode="${mode#G}" ;;
esac
lock /var/run/firewall-interface.lock