From e596c92d7475ef2d0ffd4b9c579257c3f0e32201 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 30 Apr 2007 15:25:07 +0000
Subject: [PATCH] Fix some rule problems -- Take 2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6155 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Chains.pm | 2 +-
 Shorewall-perl/Shorewall/Rules.pm  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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