mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-20 12:39:06 +01:00
Couple of tweaks to my earliest code
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
83d8d497d7
commit
076da4bd5c
@ -404,9 +404,7 @@ sub process_zone( \$ ) {
|
|||||||
if ( $type eq IPSEC ) {
|
if ( $type eq IPSEC ) {
|
||||||
require_capability 'POLICY_MATCH' , 'IPSEC zones', '';
|
require_capability 'POLICY_MATCH' , 'IPSEC zones', '';
|
||||||
for ( @parents ) {
|
for ( @parents ) {
|
||||||
unless ( $zones{$_}{type} == IPSEC ) {
|
set_super( $zones{$_} ) unless $zones{$_}{type} == IPSEC;
|
||||||
set_super( $zones{$_} );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -420,7 +418,7 @@ sub process_zone( \$ ) {
|
|||||||
options => { in_out => parse_zone_option_list( $options || '', $type ) ,
|
options => { in_out => parse_zone_option_list( $options || '', $type ) ,
|
||||||
in => parse_zone_option_list( $in_options || '', $type ) ,
|
in => parse_zone_option_list( $in_options || '', $type ) ,
|
||||||
out => parse_zone_option_list( $out_options || '', $type ) ,
|
out => parse_zone_option_list( $out_options || '', $type ) ,
|
||||||
complex => ($type == IPSEC || $options || $in_options || $out_options ? 1 : 0) ,
|
complex => ( $type == IPSEC || $options || $in_options || $out_options ) ,
|
||||||
nested => @parents > 0 ,
|
nested => @parents > 0 ,
|
||||||
super => 0 ,
|
super => 0 ,
|
||||||
} ,
|
} ,
|
||||||
|
Loading…
Reference in New Issue
Block a user