extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Restore original $actionfile logic in process_actions()

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-12-01 08:09:20 -08:00
parent ae5680401f
commit 44f00cd0aa
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1501,8 +1501,6 @@ sub process_actions() {
fatal_error "Invalid option($options)" unless $options eq '-'; fatal_error "Invalid option($options)" unless $options eq '-';
} }
my $actionfile;
if ( my $actiontype = $targets{$action} ) { if ( my $actiontype = $targets{$action} ) {
if ( ( $actiontype & ACTION ) && ( $type == INLINE ) ) { if ( ( $actiontype & ACTION ) && ( $type == INLINE ) ) {
if ( $actions{$action}->{noinline} ) { if ( $actions{$action}->{noinline} ) {
@ -1520,7 +1518,7 @@ sub process_actions() {
new_action $action, $type, $noinline; new_action $action, $type, $noinline;
$actionfile = find_file( "action.$action" ) unless $actionfile; my $actionfile = find_file( "action.$action" );
fatal_error "Missing Action File ($actionfile)" unless -f $actionfile; fatal_error "Missing Action File ($actionfile)" unless -f $actionfile;