diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm index bb7980560..0a56dd4f8 100644 --- a/Shorewall-perl/Shorewall/Chains.pm +++ b/Shorewall-perl/Shorewall/Chains.pm @@ -197,7 +197,7 @@ use constant { STANDARD => 1, #defined by Netfilter # our %targets = ('ACCEPT' => STANDARD, 'ACCEPT+' => STANDARD + NONAT, - 'ACCEPT-' => STANDARD + 'ACCEPT-' => STANDARD, 'ACCEPT!' => STANDARD, 'NONAT' => STANDARD + NONAT + NATONLY, 'DROP' => STANDARD, diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm index e0db0b063..a3e867b17 100644 --- a/Shorewall-perl/Shorewall/Rules.pm +++ b/Shorewall-perl/Shorewall/Rules.pm @@ -912,6 +912,8 @@ sub process_rule1 ( $$$$$$$$$ ) { $action = 'reject'; } elsif ( $action eq 'CONTINUE' ) { $action = 'RETURN'; + } elsif ( $actiontype & LOGRULE ) { + fatal_error 'LOG requires a log level' unless defined $loglevel and $loglevel ne ''; } # # Isolate and validate source and destination zones