From 080bdfa9e2ac3f848ba81d2f15f2ae11e40e1391 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 17 Feb 2004 22:56:04 +0000
Subject: [PATCH] Restore version 1.4 of the rules file -- allow removing
 common action

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1154 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/firewall | 2 ++
 Shorewall2/rules    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index a4f7fbe23..f2fd9da5f 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -2427,6 +2427,8 @@ process_actions1() {
 			    ;;
 		    esac
 	    esac
+
+	    [ -z "$xaction" ] && continue
 	    
 	    [ "$xaction" = "$(chain_base $xaction)" ] || fatal_error "Invalid Action Name: $xaction"
 
diff --git a/Shorewall2/rules b/Shorewall2/rules
index 4d9fb1204..c26000d14 100755
--- a/Shorewall2/rules
+++ b/Shorewall2/rules
@@ -39,6 +39,7 @@
 #					    Like REDIRET but only generates the
 #					    REDIRECT iptables rule and not
 #					    the companion ACCEPT rule.
+#
 #				CONTINUE -- (For experts only). Do not process
 #					    any of the following rules for this
 #					    (source zone,destination zone). If
@@ -50,7 +51,8 @@
 #					    (those) zone(s).
 #				LOG      -- Simply log the packet and continue.
 #				QUEUE	 -- Queue the packet to a user-space
-#					    application such as p2pwall.
+#					    application such as ftwall
+#					    (http://p2pwall.sf.net).
 #				<action> -- The name of an action defined in
 #					    /etc/shorewall/actions.
 #