From 1870c281a9bf4e1d8a7aa3ca4106aae03c017125 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 25 Nov 2012 08:26:44 -0800 Subject: [PATCH] Make AUDIT support params again. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Chains.pm | 2 +- Shorewall/Perl/Shorewall/Rules.pm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm index fc387dcd8..98c4ef214 100644 --- a/Shorewall/Perl/Shorewall/Chains.pm +++ b/Shorewall/Perl/Shorewall/Chains.pm @@ -2467,7 +2467,7 @@ sub initialize_chain_table($) { 'A_ACCEPT' => STANDARD + AUDIT, 'A_ACCEPT+' => STANDARD + NONAT + AUDIT, 'NONAT' => STANDARD + NONAT + NATONLY, - 'AUDIT' => STANDARD, + 'AUDIT' => STANDARD + AUDIT, 'DROP' => STANDARD, 'DROP!' => STANDARD, 'A_DROP' => STANDARD + AUDIT, diff --git a/Shorewall/Perl/Shorewall/Rules.pm b/Shorewall/Perl/Shorewall/Rules.pm index 845caf294..39c60a549 100644 --- a/Shorewall/Perl/Shorewall/Rules.pm +++ b/Shorewall/Perl/Shorewall/Rules.pm @@ -1837,6 +1837,7 @@ sub process_rule1 ( $$$$$$$$$$$$$$$$$$ ) { require_capability ( 'AUDIT_TARGET', 'The AUDIT action', 's' ); $param = $param eq '' ? 'drop' : $param; fatal_error "Invalid AUDIT type ($param) -- must be 'accept', 'drop' or 'reject'" unless $param =~ /^(?:accept|drop|reject)$/; + $actiontype = STANDARD; } elsif ( $actiontype & NFLOG ) { validate_level( $action ); $loglevel = supplied $loglevel ? join( ':', $action, $loglevel ) : $action;