From 58e480b502c104caad7aead639541a6a3d2c26ac Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 17 Feb 2011 17:35:56 -0800 Subject: [PATCH] Correct defects in the prior commit --- Shorewall/Perl/Shorewall/Chains.pm | 2 +- Shorewall/Perl/Shorewall/Config.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index 8af76f2c2..678da54f5 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 6983854c4..01d70c1ef 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,