holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Cleaner fix for extraneous quote problem

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4192 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-07-05 15:12:02 +00:00
parent e888aada87
commit 199416cbef
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Shorewall/functions
View File

@ -1478,25 +1478,16 @@ log_rule_limit() # $1 = log level, $2 = chain, $3 = display Chain $4 = dispositi
error_message "WARNING: Log Prefix shortened to \"$prefix\"" error_message "WARNING: Log Prefix shortened to \"$prefix\""
fi fi
if [ "$COMMAND" = compile ]; then [ "$COMMAND" = compile ] && prefix="\"$prefix\""
case $level in
ULOG) case $level in
run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix \"$prefix\" ULOG)
;; run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix "$prefix"
*) ;;
run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix \"$prefix\" *)
;; run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix "$prefix"
esac ;;
else esac
case $level in
ULOG)
run_iptables $command $chain $@ $limit -j ULOG $LOGPARMS --ulog-prefix "$prefix"
;;
*)
run_iptables $command $chain $@ $limit -j LOG $LOGPARMS --log-level $level --log-prefix "$prefix"
;;
esac
fi
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
[ -z "$STOPPING" ] && { stop_firewall; exit 2; } [ -z "$STOPPING" ] && { stop_firewall; exit 2; }

6
Shorewall/releasenotes.txt
View File

@ -33,8 +33,10 @@ Note to users upgrading from Shorewall 2.x or 3.0
Problems Corrected in 3.2.0 Final Problems Corrected in 3.2.0 Final
1) Logging rules generated at run-time (such as smurf rules) contained 1) Logging rules generated at run-time (such as smurf rules associated
extraneous double quotes around the log prefix. with interfaces with 'detect' in the BROADCAST column of
/etc/shorewall/interfaces) contained extraneous double quotes
around the log prefix.
Other changes in 3.2.0 Final Other changes in 3.2.0 Final