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

Pass normalized action name to process_rule_common()

Browse Source
This commit is contained in:
Tom Eastep 2010-12-25 10:15:08 -08:00
parent 39f4f03b60
commit 8218cb3444
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,7 +268,8 @@ sub map_old_actions( $ ) {
sub process_rule_common ( $$$$$$$$$$$$$$$$ ); sub process_rule_common ( $$$$$$$$$$$$$$$$ );
sub process_action1( $ ) { sub process_action1( $ ) {
my $action = shift; my $wholeaction = shift;
my ( $action , $level, $tag, $param ) = split /:/, $wholeaction;
my $actionfile = find_file "action.$action"; my $actionfile = find_file "action.$action";
fatal_error "Missing Action File ($actionfile)" unless -f $actionfile; fatal_error "Missing Action File ($actionfile)" unless -f $actionfile;
@ -285,7 +286,7 @@ sub process_action1( $ ) {
# deals with the target and the parameter. We pass undef for the rest so we'll # deals with the target and the parameter. We pass undef for the rest so we'll
# know if we try to use one of them. # know if we try to use one of them.
# #
process_rule_common( $action , process_rule_common( $wholeaction ,
$wholetarget , $wholetarget ,
'' , # Current Param '' , # Current Param
undef, # source undef, # source
@ -343,7 +344,7 @@ sub process_actions1() {
fatal_error "Missing Action File ($actionfile)" unless -f $actionfile; fatal_error "Missing Action File ($actionfile)" unless -f $actionfile;
process_action1( $action ); process_action1 normalize_action_name $action;
} }
} }
} }
@ -757,12 +758,13 @@ sub process_rule_common ( $$$$$$$$$$$$$$$$ ) {
my $inaction1; my $inaction1;
my $inaction3; my $inaction3;
my $normalized_target; my $normalized_target;
my $normalized_action;
if ( defined $chainref ) { if ( defined $chainref ) {
if ( reftype $chainref ) { if ( reftype $chainref ) {
$inaction3 = 1; $inaction3 = 1;
} else { } else {
$inaction1 = $chainref; ( $inaction1, undef, undef, undef ) = split /:/, $normalized_action = $chainref;
} }
} }