From f90328f26ef73fc5a0c2d9a751936e9af060ccba Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 16 Sep 2010 11:47:35 +0000
Subject: firewall: make invalid redirects and duplicate zones non-fatal, print
 a notice and discard them

SVN-Revision: 23080
---
 package/firewall/files/lib/core.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'package/firewall/files/lib/core.sh')

diff --git a/package/firewall/files/lib/core.sh b/package/firewall/files/lib/core.sh
index c350e8f0f6..c383597810 100644
--- a/package/firewall/files/lib/core.sh
+++ b/package/firewall/files/lib/core.sh
@@ -107,10 +107,8 @@ fw_die() {
 
 fw_log() {
 	local level="$1"
-	[ -n "$2" ] || {
-		shift
-		level=notice
-	}
+	[ -n "$2" ] && shift || level=notice
+	[ "$level" != error ] || echo "Error: $@" >&2
 	logger -t firewall -p user.$level "$@"
 }
 
-- 
cgit v1.2.3