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

Pick up one fix from 4.4.7.4 regarding CONTINUE rules.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-02-20 09:42:58 -08:00
parent 5696742ef3
commit 6307653a01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -174,7 +174,7 @@ our %EXPORT_TAGS = (
Exporter::export_ok_tags('internal');
our $VERSION = '4.4_7';
our $VERSION = '4.4_8';
#
# Chain Table
@ -2047,7 +2047,7 @@ sub do_ratelimit( $$ ) {
$limit .= $rate =~ /^s:/ ? 'srcip ' : 'dstip ';
if ( $units && $units ne 'sec' ) {
my $expire = 60000; # I minute in milliseconds
my $expire = 60000; # 1 minute in milliseconds
if ( $units ne 'min' ) {
$expire *= 60; #At least an hour
@ -3274,7 +3274,7 @@ sub expand_rule( $$$$$$$$$$;$ )
if ( $loglevel ne '' ) {
if ( $disposition ne 'LOG' ) {
unless ( $logname || $disposition eq 'RETURN' ) {
unless ( $logname || $target =~ /-j RETURN\b/ ) {
#
# Find/Create a chain that both logs and applies the target action
# and jump to the log chain if all of the rule's conditions are met