holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Drop some cruft

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@7695 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-11-19 20:02:21 +00:00
parent e101e6d0dd
commit fbd4d3638d
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,7 +565,7 @@ sub process_action( $$$$$$$$$$ ) {
}
#
# Expand Macro in action file4s.
# Expand Macro in action files.
#
sub process_macro3( $$$$$$$$$$$ ) {
my ( $fn, $param, $chainref, $action, $source, $dest, $proto, $ports, $sports, $rate, $user ) = @_;
@ -574,8 +574,6 @@ sub process_macro3( $$$$$$$$$$$ ) {
push_open $fn;
my $standard = ( $fn =~ /^($globals{SHAREDIR})/ );
while ( read_a_line ) {
my ( $mtarget, $msource, $mdest, $mproto, $mports, $msports, $mrate, $muser ) = split_line 1, 8, 'macro file';
@ -633,7 +631,6 @@ sub process_macro3( $$$$$$$$$$$ ) {
sub process_action3( $$$$$ ) {
my ( $chainref, $wholeaction, $action, $level, $tag ) = @_;
my $actionfile = find_file "action.$action";
my $standard = ( $actionfile =~ /^$globals{SHAREDIR}/ );
fatal_error "Missing Action File ($actionfile)" unless -f $actionfile;
@ -656,7 +653,7 @@ sub process_action3( $$$$$ ) {
( $action2 , my $param ) = get_target_param $action2;
my $action2type = $targets{$action2};
my $action2type = $targets{$action2} || 0;
unless ( $action2type == STANDARD ) {
if ( $action2type & ACTION ) {