From e21c3a0f8b968a7f7ce297b249c69069be9a0463 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 2 Sep 2004 16:59:57 +0000
Subject: [PATCH] Fix tcrules PROTO processing

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1592 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 STABLE2/changelog.txt    | 4 ++++
 STABLE2/firewall         | 2 ++
 STABLE2/releasenotes.txt | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 166a0594e..ecc929c67 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -50,3 +50,7 @@ Changes in 2.0.8
 1) Removed dead code from process_actions2()
 
 2) Corrected read command in process_actions2() (userspec)
+
+Changes in 2.0.9
+
+1) Corrected setup_tc1() handling of the PROTO column. 
diff --git a/STABLE2/firewall b/STABLE2/firewall
index 28fd28713..8de9d460b 100755
--- a/STABLE2/firewall
+++ b/STABLE2/firewall
@@ -2075,6 +2075,8 @@ process_tc_rule()
 	fi
 
 	[ "x$dest"   = "x-"  ] || r="${r}-d $dest "
+	[ "x$proto"  = "x-"  ] && proto=all
+	[ "x$proto"  = "x"   ] && proto=all
 	[ "$proto"   = "all" ] || r="${r}-p $proto "
 	[ "x$port"   = "x-"  ] || r="${r}--dport $port "
 	[ "x$sport"  = "x-"  ] || r="${r}--sport $sport "
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index 1d46a48b7..6aea47edf 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -119,6 +119,12 @@ Problems Corrected in version 2.0.8
 
 1) User/group restricted rules now work in actions.
 
+-----------------------------------------------------------------------
+Problems Corrected in version 2.0.9
+
+1) Previously, an empty PROTO column or a value of "all" in that column
+   would cause errors when processing the /etc/shorewall/tcrules file.
+