From cffd08c0fe1bb8398df399f2f8e249a3bd364caa Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 9 Jan 2007 15:55:47 +0000
Subject: [PATCH] Fix handling of ipp2p:udp in an action body

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5209 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    | 6 ++++++
 Shorewall/lib.actions      | 2 +-
 Shorewall/releasenotes.txt | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 9c17f60f0..f21d76a1a 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -1,3 +1,9 @@
+Changes in 3.4.0 Beta 3
+
+1)  Handle VLAN interface names like vlanX@ethY.
+
+2)  Fix ipp2p:udp handling in action body.
+
 Changes in 3.4.0 Beta 2
 
 1)  Fix for empty blacklist file.
diff --git a/Shorewall/lib.actions b/Shorewall/lib.actions
index f8ae4d8c5..d7b82e4a7 100644
--- a/Shorewall/lib.actions
+++ b/Shorewall/lib.actions
@@ -101,7 +101,7 @@ add_an_action()
 		port=
 		do_ports
 		;;
-	    ipp2p:udpIPP2P:UDP)
+	    ipp2p:udp|IPP2P:UDP)
 		proto=udp
 		port=
 		do_ports
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 482c17506..cef78a7d4 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -33,6 +33,9 @@ Problems Corrected in 3.4.0 Beta 3
 1)  Shorewall now supports VLAN interfaces with names of the form
     vlan@ethX.
 
+2)  Previously, "ipp2p:udp" was incorrectly rejected in the PROTO
+    column of an action definition.
+
 Migration Considerations:
 
 1)  Shorewall supports the notion of "default actions". A default