Fix double LOG rules in actions

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1378 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-05-29 15:10:53 +00:00
parent 30a41862ad
commit 4eb0e261b9
7 changed files with 17 additions and 8 deletions

View File

@ -73,3 +73,5 @@ Changes since 2.0.1
35) Load modules before detecting capabilities.
36) Fix 'newnotsyn' in the hosts file.
37) Fix double LOG rules in actions.

View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall.
VERSION=2.0.2d
VERSION=2.0.2e
usage() # $1 = exit status
{

View File

@ -2496,8 +2496,9 @@ add_an_action()
$(fix_bang $proto $sports $multiport $cli -d $srv $dports)
fi
run_iptables2 -A $action $proto $multiport $cli $sports \
-d $srv $dports $ratelimit $userandgroup -j $target
[ "$logtarget" = LOG ] || \
run_iptables2 -A $action $proto $multiport $cli $sports \
-d $srv $dports $ratelimit $userandgroup -j $target
done
done
else
@ -2506,8 +2507,9 @@ add_an_action()
$(fix_bang $proto $sports $multiport $cli $dports)
fi
run_iptables2 -A $action $proto $multiport $cli $sports \
$dports $ratelimit $userandgroup -j $target
[ "$logtarget" = LOG ] || \
run_iptables2 -A $action $proto $multiport $cli $sports \
$dports $ratelimit $userandgroup -j $target
fi
fi
}

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
#
VERSION=2.0.2d
VERSION=2.0.2e
usage() # $1 = exit status
{

View File

@ -39,6 +39,9 @@ Problems Corrected since 2.0.2
capabilities will be misdetected.
7) The 'newnotsyn' option in /etc/shorewall/hosts has no effect.
8) When used within an action, the LOG target produces two logging
rules.
-----------------------------------------------------------------------
Issues when migrating from Shorewall 2.0.1 to Shorewall 2.0.2:

View File

@ -1,5 +1,5 @@
%define name shorewall
%define version 2.0.2d
%define version 2.0.2e
%define release 1
%define prefix /usr
@ -141,6 +141,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
%changelog
* Sat May 29 2004 Tom Eastep tom@shorewall.net
- Updated for 2.0.2e-1
* Thu May 27 2004 Tom Eastep tom@shorewall.net
- Updated for 2.0.2d-1
* Fri May 21 2004 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version
# shown below. Simply run this script to remove Seattle Firewall
VERSION=2.0.2d
VERSION=2.0.2e
usage() # $1 = exit status
{