On 2/17/11 4:41 PM, Tom Eastep wrote:
> On 2/17/11 4:29 PM, Tom Eastep wrote:

> 
> May want to hold that one -- it has one fatal flaw :-)
> 

But should be okay if you apply this one next.


Thanks again, Steven

-Tom (who should have run the regression suite before sending the last
patch).
-- 
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/Perl/Shorewall/Chains.pm 
b/Shorewall/Perl/Shorewall/Chains.pm
index 8af76f2..678da54 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -1353,7 +1353,7 @@ sub ensure_accounting_chain( $$$ )
        $chainref->{ipsec}       = $ipsec;
        $chainref->{dont_optimize} = 1 unless $config{OPTIMIZE_ACCOUNTING};
 
-       if ( $chain ne 'accounting' ) {
+       unless ( $chain =~ '^account(?:in|ing|out)' ) {
            my $file = find_file $chain;
 
            if ( -f $file ) {
diff --git a/Shorewall/Perl/Shorewall/Config.pm 
b/Shorewall/Perl/Shorewall/Config.pm
index 6983854..01d70c1 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -264,7 +264,7 @@ our %capdesc = ( NAT_ENABLED     => 'NAT',
                 KERNELVERSION   => 'Kernel Version',
               );
 
-our %config_files = ( accounting       => 1,
+our %config_files = ( #accounting      => 1,
                      actions          => 1,
                      blacklist        => 1,
                      clear            => 1,

Attachment: signature.asc
Description: OpenPGP digital signature

------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel

Reply via email to