aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commit2caca9f37810bfcd449d87d7bf743f2f37511682 (patch)
treef240a51eecdb981cd4be841021a55fdac4c50911 /package
parent1acd0581a5a648f7bf9621cc3415b281d73205af (diff)
downloadmaster-187ad058-2caca9f37810bfcd449d87d7bf743f2f37511682.tar.gz
master-187ad058-2caca9f37810bfcd449d87d7bf743f2f37511682.tar.bz2
master-187ad058-2caca9f37810bfcd449d87d7bf743f2f37511682.zip
[package] firewall: fix rule generation for v4 or v6 only zones (#8955)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25813 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-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