mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-26 12:42:40 +02:00
Correct policy zone exclusion handling
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
15dd14e167
commit
e626b77097
@ -836,11 +836,15 @@ sub process_a_policy() {
|
|||||||
|
|
||||||
my ( $intrazone, $clientlist, $serverlist );
|
my ( $intrazone, $clientlist, $serverlist );
|
||||||
|
|
||||||
if ( $clientlist = ( $clients =~ /,/ ) ) {
|
if ( $clients =~ /^all(\+)?!/ ) {
|
||||||
|
$intrazone = $1;
|
||||||
|
} elsif ( $clientlist = ( $clients =~ /,/ ) ) {
|
||||||
$intrazone = ( $clients =~ s/\+$// );
|
$intrazone = ( $clients =~ s/\+$// );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $serverlist = ( $servers =~ /,/ ) ) {
|
if ( $servers =~ /^all(\+)?!/ ) {
|
||||||
|
$intrazone = $1;
|
||||||
|
} elsif ( $serverlist = ( $servers =~ /,/ ) ) {
|
||||||
$intrazone ||= ( $servers =~ s/\+$// );
|
$intrazone ||= ( $servers =~ s/\+$// );
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -857,7 +861,7 @@ sub process_a_policy() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
process_a_policy1( $clients, $servers, $policy, $loglevel, $synparams, $connlimit, 0 );
|
process_a_policy1( $clients, $servers, $policy, $loglevel, $synparams, $connlimit, $intrazone );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user