Fix some bugs

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5648 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-03-23 19:54:08 +00:00
parent b9a36331b4
commit 19779c8e9f

View File

@ -244,9 +244,7 @@ sub add_command($$)
{
my ($chainref, $command) = @_;
$command =~ s/^/~/;
push @{$chainref->{rules}}, ( ( ' ' x $loopcount ) . $command );
push @{$chainref->{rules}}, '~' . ( ( ' ' x $loopcount ) . $command );
$chainref->{referenced} = 1;
@ -1014,7 +1012,7 @@ sub expand_rule( $$$$$$$$$$ )
if ( $dest ) {
if ( $dest eq '-' ) {
$dest = '';
} elsif ( $restriction == PREROUTE_RESTRICTION $dest =~ /^detect:(.*)$/ ) {
} elsif ( $restriction == PREROUTE_RESTRICT && $dest =~ /^detect:(.*)$/ ) {
#
# DETECT_DNAT_IPADDRS=Yes and we're generating the nat rule
#
@ -1216,7 +1214,10 @@ sub expand_rule( $$$$$$$$$$ )
}
}
add_command $chainref, 'done' while $loopcount--;
while ( $loopcount > 0 ) {
$loopcount--;
add_command $chainref, 'done';
}
}
#