extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-15 12:14:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete $caller argument from process_default_action()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-01-21 09:45:54 -08:00
parent 5beae475f5
commit 982fabc96f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -330,8 +330,8 @@ sub use_policy_action( $$ );
sub normalize_action( $$$ ); sub normalize_action( $$$ );
sub normalize_action_name( $ ); sub normalize_action_name( $ );
sub process_default_action( $$$$$ ) { sub process_default_action( $$$$ ) {
my ( $originalpolicy, $policy, $default, $level, $caller ) = @_; my ( $originalpolicy, $policy, $default, $level ) = @_;
if ( supplied $default ) { if ( supplied $default ) {
my $default_option = ( $policy =~ /_DEFAULT$/ ); my $default_option = ( $policy =~ /_DEFAULT$/ );
@ -419,9 +419,7 @@ sub process_a_policy() {
fatal_error "A $policy policy may not be audited" unless $auditpolicies{$policy}; fatal_error "A $policy policy may not be audited" unless $auditpolicies{$policy};
} }
my $chain = rules_chain( ${client}, ${server} ); $default = process_default_action( $originalpolicy, $policy, $default, $level );
$default = process_default_action( $originalpolicy, $policy, $default, $level, $chain );
if ( defined $queue ) { if ( defined $queue ) {
fatal_error "Invalid policy ($policy($queue))" unless $policy eq 'NFQUEUE'; fatal_error "Invalid policy ($policy($queue))" unless $policy eq 'NFQUEUE';
@ -443,6 +441,7 @@ sub process_a_policy() {
} }
} }
my $chain = rules_chain( ${client}, ${server} );
my $chainref; my $chainref;
if ( defined $filter_table->{$chain} ) { if ( defined $filter_table->{$chain} ) {
@ -555,7 +554,7 @@ sub process_policies()
unless ( $action eq 'none' ) { unless ( $action eq 'none' ) {
my ( $default, $level, $remainder ) = split( /:/, $action, 3 ); my ( $default, $level, $remainder ) = split( /:/, $action, 3 );
fatal_error "Invalid setting ( $action ) for $option" if supplied $remainder; fatal_error "Invalid setting ( $action ) for $option" if supplied $remainder;
$action = process_default_action( $action, $option, $default, $level, 'POLICY' ); $action = process_default_action( $action, $option, $default, $level );
} }
$default_actions{$map{$option}} = $action; $default_actions{$map{$option}} = $action;