mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-17 11:51:20 +01:00
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:
parent
b9a36331b4
commit
19779c8e9f
@ -244,9 +244,7 @@ sub add_command($$)
|
|||||||
{
|
{
|
||||||
my ($chainref, $command) = @_;
|
my ($chainref, $command) = @_;
|
||||||
|
|
||||||
$command =~ s/^/~/;
|
push @{$chainref->{rules}}, '~' . ( ( ' ' x $loopcount ) . $command );
|
||||||
|
|
||||||
push @{$chainref->{rules}}, ( ( ' ' x $loopcount ) . $command );
|
|
||||||
|
|
||||||
$chainref->{referenced} = 1;
|
$chainref->{referenced} = 1;
|
||||||
|
|
||||||
@ -1014,7 +1012,7 @@ sub expand_rule( $$$$$$$$$$ )
|
|||||||
if ( $dest ) {
|
if ( $dest ) {
|
||||||
if ( $dest eq '-' ) {
|
if ( $dest eq '-' ) {
|
||||||
$dest = '';
|
$dest = '';
|
||||||
} elsif ( $restriction == PREROUTE_RESTRICTION $dest =~ /^detect:(.*)$/ ) {
|
} elsif ( $restriction == PREROUTE_RESTRICT && $dest =~ /^detect:(.*)$/ ) {
|
||||||
#
|
#
|
||||||
# DETECT_DNAT_IPADDRS=Yes and we're generating the nat rule
|
# 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';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user