[Shorewall-devel] [PATCH] Re: Shorewall 4.5.13 RC 1

[Tom Eastep]

On 02/03/2013 02:56 PM, Steven Jan Springl wrote:
> Tom
> 
> In the attached config:
> 
> Rule:
> 
> New(ACCEPT)  lan  fw  udp  123
> 
> produces the following error message:
> 
> ERROR: Undefined subroutine &Shorewall::User::check_state called at 
> /usr/share/shorewall/action.New line 46.
> 
> ---------------------------------
> 
> Rule:
> 
> Untracked(ACCEPT)  lan  fw  udp  123
> 
> produces the following error messages:
> 
> ERROR: "process_rule1" is not exported by the Shorewall::Rules module
> 
> Can't continue after import errors at /usr/share/shorewall/action.Untracked 
> line 39
> 
> BEGIN failed--compilation aborted at /usr/share/shorewall/action.Untracked 
> line 39.
> 
> ---------------------------------
> 
> Rule:
> 
> Related(ACCEPT)  lan  fw  udp  123
> 
> produces the following error message:
> 
> ERROR: Global symbol "$check" requires explicit package name at 
> /usr/share/shorewall/action.Related line 44.
> 
> ---------------------------------
> 
> Rule:
> 
> Established(ACCEPT)  lan  fw  udp  123
> 
> produces the following error message:
> 
> ERROR: Undefined subroutine &Shorewall::User::check_state called at 
> /usr/share/shorewall/action.Established line 42.

The attached patch corrects these issues. There will another patch
forthcoming that corrects an issue that came up while I was testing this
patch.

Thanks Steven,
-Tom
-- 
Tom Eastep        \ When I die, I want to go like my Grandfather who
Shoreline,         \ died peacefully in his sleep. Not screaming like
Washington, USA     \ all of the passengers in his car
http://shorewall.net \________________________________________________

diff --git a/Shorewall/action.Established b/Shorewall/action.Established
index 58365aa..e8c3489 100644
--- a/Shorewall/action.Established
+++ b/Shorewall/action.Established
@@ -36,10 +36,11 @@ DEFAULTS ACCEPT
 use Shorewall::IPAddrs;
 use Shorewall::Config;
 use Shorewall::Chains;
+use Shorewall::Rules;
 
 my ( $action ) = get_action_params( 1 );
 
-if ( my $state = check_state( 'ESTABLISHED' ) ) {
+if ( my $check = check_state( 'ESTABLISHED' ) ) {
     perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} 
ESTABLISHED" : '' );
 }
 
diff --git a/Shorewall/action.New b/Shorewall/action.New
index eb2e81b..898bf4c 100644
--- a/Shorewall/action.New
+++ b/Shorewall/action.New
@@ -36,6 +36,7 @@ DEFAULTS ACCEPT
 use Shorewall::IPAddrs;
 use Shorewall::Config;
 use Shorewall::Chains;
+use Shorewall::Rules;
 
 my ( $action ) = get_action_params( 1 );
 
diff --git a/Shorewall/action.Related b/Shorewall/action.Related
index ad8850a..cb76de2 100644
--- a/Shorewall/action.Related
+++ b/Shorewall/action.Related
@@ -37,10 +37,11 @@ use strict;
 use Shorewall::IPAddrs;
 use Shorewall::Config;
 use Shorewall::Chains;
+use Shorewall::Rules;
 
 my ( $action ) = get_action_params( 1 );
 
-if ( my $state = check_state( 'RELATED' ) ) {
+if ( my $check = check_state( 'RELATED' ) ) {
     perl_action_helper( $action, $check == 1 ? "$globals{STATEMATCH} RELATED" 
: '' );
 }
 
diff --git a/Shorewall/action.Untracked b/Shorewall/action.Untracked
index 2a6e1e2..0bcb9ab 100644
--- a/Shorewall/action.Untracked
+++ b/Shorewall/action.Untracked
@@ -36,7 +36,7 @@ DEFAULTS DROP,-
 use Shorewall::IPAddrs;
 use Shorewall::Config;
 use Shorewall::Chains;
-use Shorewall::Rules qw( process_rule1 );
+use Shorewall::Rules;
 
 my ( $action ) = get_action_params( 1 );
 

signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Shorewall-devel mailing list
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel