extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-25 20:22:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove extraneous double quotes from LOG rules generated at run-time

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4189 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-07-04 17:15:33 +00:00
parent ed760be0ac
commit e888aada87
3 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Shorewall/changelog.txt
View File

@ -1,10 +1,15 @@
Changes in 3.2.0 RC 5 Changes in 3.2.0 Final
1) Avoid extraneous double quotes in log rules generated at run-time.
Changes in 3.2.0 RC 6
1) Correct generation of the balanced default route. 1) Correct generation of the balanced default route.
2) Allow 'detect' in the ADDRESS column of the masq file. 2) Allow 'detect' in the ADDRESS column of the masq file.
3) Correct some permission problems. 3) Correct some permission problems.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Changes in 3.2.0 RC 5 Changes in 3.2.0 RC 5

27
Shorewall/functions
View File

@ -1478,14 +1478,25 @@ 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
case $level in if [ "$COMMAND" = compile ]; then
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 ;;
esac
else
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; }

25
Shorewall/releasenotes.txt
View File

@ -1,4 +1,4 @@
Shorewall 3.2.0 RC 6 Shorewall 3.2.0
Note to users upgrading from Shorewall 2.x or 3.0 Note to users upgrading from Shorewall 2.x or 3.0
@ -31,27 +31,14 @@ Note to users upgrading from Shorewall 2.x or 3.0
Please see the "Migration Considerations" below for additional upgrade Please see the "Migration Considerations" below for additional upgrade
information. information.
Problems Corrected in 3.2.0 RC 6 Problems Corrected in 3.2.0 Final
1) When 'balance' is specified in more than one provider, only the 1) Logging rules generated at run-time (such as smurf rules) contained
last such provider appears in the default route. extraneous double quotes around the log prefix.
2) The permission settings of /etc/shorewall/params and of several Other changes in 3.2.0 Final
files in /usr/share/shorewall/configfiles were incorrect.
Other changes in 3.2.0 RC 6 None.
1) This change will be in 3.0.9 so I'm slipping it into this RC for
compatibility.
It is now possible to use the special value 'detect' in the ADDRESS
column of /etc/shorewall/masq. This allows you to specify SNAT (as
opposed to MASQUERADE) without having to know the ip address of the
external interface. Shorewall must be restarted each time that the
external address (the address of the interface named in the
INTERFACE column) changes. Note that if you have done a 'shorewall
save' then it is sufficient to "shorewall restore" since the
restore script will re-detect the interface's IP address(es).
Migration Considerations: Migration Considerations: