extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-19 08:07:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of Action extension scripts

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6195 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-02 16:43:58 +00:00
parent 16d22e9c27
commit 79d57a7751
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall-perl/Shorewall/Actions.pm
View File

@ -80,7 +80,7 @@ my %logactionchains;
# Maps each used macro to it's 'macro. ...' file. # Maps each used macro to it's 'macro. ...' file.
# #
# #
# This function determines the logging for a subordinate action or a rule within a subordinate action # This function determines the logging for a subordinate action or a rule within a superior action
# #
sub merge_levels ($$) { sub merge_levels ($$) {
my ( $superior, $subordinate ) = @_; my ( $superior, $subordinate ) = @_;
@ -179,7 +179,7 @@ sub createlogactionchain( $$ ) {
if ( -f $file ) { if ( -f $file ) {
progress_message "Processing $file..."; progress_message "Processing $file...";
unless ( my $return = do $file ) { unless ( my $return = eval `cat $file` ) {
fatal_error "Couldn't parse $file: $@" if $@; fatal_error "Couldn't parse $file: $@" if $@;
fatal_error "Couldn't do $file: $!" unless defined $return; fatal_error "Couldn't do $file: $!" unless defined $return;
fatal_error "Couldn't run $file" unless $return; fatal_error "Couldn't run $file" unless $return;