diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2011-03-30 20:29:17 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-03-30 20:29:17 +0000 |
commit | af82471525ca97845f0c1550a4203a15d9402995 (patch) | |
tree | 7bd93f8ac893bf7f8ff257b057a5a2b21963f81c /package/firewall | |
parent | d739594c8dd823d111a36652b93acf97c72f89ef (diff) | |
download | upstream-af82471525ca97845f0c1550a4203a15d9402995.tar.gz upstream-af82471525ca97845f0c1550a4203a15d9402995.tar.bz2 upstream-af82471525ca97845f0c1550a4203a15d9402995.zip |
firewall: prevent duplicate values in interface state vars
SVN-Revision: 26382
Diffstat (limited to 'package/firewall')
-rw-r--r-- | package/firewall/Makefile | 2 | ||||
-rw-r--r-- | package/firewall/files/lib/core_interface.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile index 15237ff8f4..ea407f081b 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:=23 +PKG_RELEASE:=24 include $(INCLUDE_DIR)/package.mk diff --git a/package/firewall/files/lib/core_interface.sh b/package/firewall/files/lib/core_interface.sh index aff6641807..ed6a4b150f 100644 --- a/package/firewall/files/lib/core_interface.sh +++ b/package/firewall/files/lib/core_interface.sh @@ -4,7 +4,10 @@ fw__uci_state_add() { local var="$1" local item="$2" - local val="$(uci_get_state firewall core $var)" + local val=" $(uci_get_state firewall core $var) " + val="${val// $item / }" + val="${val# }" + val="${val% }" uci_set_state firewall core $var "${val:+$val }$item" } |