From 1c9d1e9949fc39a8023a7bb55250312bb89674f2 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 25 Dec 2004 03:24:12 +0000
Subject: [PATCH] Shorewall 2.2.0 RC2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1852 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 LrpN/usr/share/shorewall/firewall | 3 ++-
 LrpN/usr/share/shorewall/version  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/LrpN/usr/share/shorewall/firewall b/LrpN/usr/share/shorewall/firewall
index 1aef6c7c7..16c556b4f 100755
--- a/LrpN/usr/share/shorewall/firewall
+++ b/LrpN/usr/share/shorewall/firewall
@@ -1595,6 +1595,7 @@ setup_tunnels() # $1 = name of tunnels file
 	options="-m state --state NEW -j ACCEPT"
 	addrule2 $inchain	  -p 50	 $(source_ip_range $1) -j ACCEPT
 	addrule2 $outchain	  -p 50	 $(dest_ip_range $1)   -j ACCEPT
+
 	if [ -z "$noah" ]; then
 	    run_iptables -A $inchain  -p 51 $(source_ip_range $1) -j ACCEPT
 	    run_iptables -A $outchain -p 51 $(dest_ip_range $1)   -j ACCEPT
@@ -1655,7 +1656,7 @@ setup_tunnels() # $1 = name of tunnels file
     setup_one_openvpn() # $1 = gateway, $2 = kind[:port]
     {
 	local protocol=udp
-	local p=5000
+	local p=1194
 
 	case $2 in
 	    *:*:*)
diff --git a/LrpN/usr/share/shorewall/version b/LrpN/usr/share/shorewall/version
index 17831900d..8e10b7bf5 100644
--- a/LrpN/usr/share/shorewall/version
+++ b/LrpN/usr/share/shorewall/version
@@ -1 +1 @@
-2.2.0-RC1
+2.2.0-RC2