diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-16 11:47:35 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-09-16 11:47:35 +0000 |
commit | 4cc4a085340f4283e29347683f8648b78b4a0683 (patch) | |
tree | be373438e3db825da9a083b4d1004308605f1855 /package/firewall/files/lib/core.sh | |
parent | eaa9187647860f3f5b77be1902adac70d0c98df4 (diff) | |
download | master-187ad058-4cc4a085340f4283e29347683f8648b78b4a0683.tar.gz master-187ad058-4cc4a085340f4283e29347683f8648b78b4a0683.tar.bz2 master-187ad058-4cc4a085340f4283e29347683f8648b78b4a0683.zip |
[package] firewall: make invalid redirects and duplicate zones non-fatal, print a notice and discard them
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23080 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall/files/lib/core.sh')
-rw-r--r-- | package/firewall/files/lib/core.sh | 6 |
1 files changed, 2 insertions, 4 deletions
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 "$@" } |