From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 23 Feb 2012 18:50:47 +0000 (+0000)
Subject: firewall: bail out if uci is used in firewall include files
X-Git-Tag: reboot~14748
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fe2d387a8c333db386df1df64c5870b33b436ee9;p=openwrt%2Fstaging%2Fxback.git

firewall: bail out if uci is used in firewall include files

SVN-Revision: 30694
---

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 54cb8dc4a9..b03fca8a03 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:=45
+PKG_RELEASE:=46
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh
index e93de1613f..035647998e 100644
--- a/package/firewall/files/lib/core_init.sh
+++ b/package/firewall/files/lib/core_init.sh
@@ -288,7 +288,13 @@ fw_load_include() {
 	local path
 	config_get path ${name} path
 
-	[ -e $path ] && ( . $path )
+	[ -e $path ] && (
+		config() {
+			fw_log error "You cannot use UCI in firewall includes!" >&2
+			exit 1
+		}
+		. $path 
+	)
 }