Fix 'DEST = all'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6299 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-09 15:08:39 +00:00
parent d00d83da9b
commit 6f15caa222

View File

@ -1117,7 +1117,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
# #
# Process a Record in the rules file # Process a Record in the rules file
# #
# Deals with the ugliness of wildcard zones ('all' in rules). # Deals with the ugliness of wildcard zones ('all' in SOURCE and/or DEST column).
# #
sub process_rule ( $$$$$$$$$$ ) { sub process_rule ( $$$$$$$$$$ ) {
my ( $target, $source, $dest, $proto, $ports, $sports, $origdest, $ratelimit, $user, $mark ) = @_; my ( $target, $source, $dest, $proto, $ports, $sports, $origdest, $ratelimit, $user, $mark ) = @_;
@ -1150,6 +1150,8 @@ sub process_rule ( $$$$$$$$$$ ) {
} elsif ( $source eq 'all-' ) { } elsif ( $source eq 'all-' ) {
$source = 'all'; $source = 'all';
$includesrcfw = 0; $includesrcfw = 0;
} else {
fatal_error "Invalid SOURCE ($source)" unless $source eq 'all';
} }
} }
@ -1161,10 +1163,13 @@ sub process_rule ( $$$$$$$$$$ ) {
$dest = 'all'; $dest = 'all';
$intrazone = 1; $intrazone = 1;
$includedstfw = 0; $includedstfw = 0;
} elsif ( $source eq 'all-' ) { } elsif ( $dest eq 'all-' ) {
$dest = 'all'; $dest = 'all';
$includedstfw = 0; $includedstfw = 0;
} else {
fatal_error "Invalid DEST ($dest)" unless $dest eq 'all';
} }
} }
my $action = isolate_basic_target $target; my $action = isolate_basic_target $target;