diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 12f99c635..301a9c846 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -8,3 +8,5 @@ Changes since 2.0.3 3) Correct mktempfile() for case where mktemp isn't installed. 4) Implement 'dropInvalid' builtin action. + +5) Fix logging nat rules. diff --git a/Shorewall2/firewall b/Shorewall2/firewall index d25b9511a..2e8e02b9a 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -3062,7 +3062,7 @@ add_nat_rule() { else for adr in $(separate_list $addr); do if [ -n "$loglevel" ]; then - log_rule_limit $loglevel $OUTPUT $logtarget "$ratelimit" "$logtag" -t nat \ + log_rule_limit $loglevel OUTPUT $logtarget "$ratelimit" "$logtag" -t nat \ $(fix_bang $proto $cli $sports $userandgroup -d $adr $multiport $dports) fi @@ -3093,7 +3093,7 @@ add_nat_rule() { done if [ -n "$loglevel" ]; then - log_rule_limit $loglevel $chain $logtarget "$ratelimit" -t nat + log_rule_limit $loglevel $chain $logtarget "$ratelimit" "$logtag" -t nat fi addnatrule $chain $ratelimit $proto -j $target1 # Protocol is necessary for port redirection diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index 4bce2d2ee..a8d9697e3 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -9,6 +9,9 @@ Problems Corrected since 2.0.3 2) A potential security vulnerablilty in the way that Shorewall handles temporary files and directories has been corrected. +3) Two problems with logging NAT rules (DNAT and REDIRECT) could cause + startup failures. + ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0 to Shorewall 2.1: