From be972f1a7efdd9d9ce3b418c5397bd050af166ff Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 11 Jun 2007 15:59:25 +0000 Subject: [PATCH] Another accounting fix git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6514 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-perl/Shorewall/Accounting.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Shorewall-perl/Shorewall/Accounting.pm b/Shorewall-perl/Shorewall/Accounting.pm index aa8be6baf..53dac6952 100644 --- a/Shorewall-perl/Shorewall/Accounting.pm +++ b/Shorewall-perl/Shorewall/Accounting.pm @@ -91,9 +91,12 @@ sub process_accounting_rule( $$$$$$$$$ ) { $source = ALLIPv4 if $source eq 'any' || $source eq 'all'; if ( @bridges ) { - if ( $source =~ /^$firewall_zone:?/ ) { + if ( $source =~ /^$firewall_zone:?(.*)$/ ) { + $source = $1; + $source = ALLIPv4 unless $source; $restriction = OUTPUT_RESTRICT; $chain = 'accountout' unless $chain and $chain ne '-'; + $dest = ALLIPv4 if $dest eq 'any' || $dest eq 'all'; } else { $chain = 'accounting' unless $chain and $chain ne '-'; if ( $dest eq 'any' || $dest eq 'all' || $dest eq ALLIPv4 ) {