From ea21ad20dcd77ae3628a66ddcdb8a1498c8ed2b5 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 30 Dec 2004 16:08:41 +0000
Subject: [PATCH] Fix misleading typo in tunnels file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1869 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 STABLE2/changelog.txt       | 3 +++
 STABLE2/releasenotes.txt    | 5 +++++
 STABLE2/tunnels             | 2 +-
 Shorewall2/changelog.txt    | 2 ++
 Shorewall2/releasenotes.txt | 2 ++
 Shorewall2/tunnels          | 2 +-
 6 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 138bfe578..72a2c6625 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -107,3 +107,6 @@ Changes in 2.0.14
 2)  Fix typo in interfaces file.
 
 3)  Eliminate "bad variable" errors during stop/clear.
+
+4)  Fix typo in tunnels file.
+
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index 4c175c007..4171ebe9c 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -262,3 +262,8 @@ Problems corrected in 2.0.14
 
 2)  "bad variable" error messages occurring during "shorewall stop" and
     "shorewall clear" have been eliminated.
+
+3)  A misleading typo in /etc/shorewall/tunnels has been corrected.
+
+
+
diff --git a/STABLE2/tunnels b/STABLE2/tunnels
index 2c032cb21..0069daad8 100644
--- a/STABLE2/tunnels
+++ b/STABLE2/tunnels
@@ -9,7 +9,7 @@
 #
 #	The columns are:
 #
-#	TYPE	    --	must start in column 1 and be "ipsec", "ipsecnat","ip"
+#	TYPE	    --	must start in column 1 and be "ipsec", "ipsecnat","ipip"
 #			"gre", "6to4", "pptpclient", "pptpserver", "openvpn" or 
 #			"generic"
 #
diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index bb6158a53..ad5c97ee1 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -198,3 +198,5 @@ Changes since 2.0.3
 96) Correct rate limiting rule example.
 
 97) Fix <if>:: handling in setup_masq().
+
+98) Fix mis-leading typo in tunnels.
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 7aeb193ea..008402979 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -205,6 +205,8 @@ Problems corrected since 2.2.0 RC2
 3) Entries in /etc/shorewall/masq with the INTERFACE column containing
    <ifname>:: would generate a progress message but would not generate
    an iptables rule. 
+
+4) A misleading typo in /etc/shorewall/tunnels has been corrected.
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0 to Shorewall 2.2:
 
diff --git a/Shorewall2/tunnels b/Shorewall2/tunnels
index 41110f06c..c764d63ba 100644
--- a/Shorewall2/tunnels
+++ b/Shorewall2/tunnels
@@ -9,7 +9,7 @@
 #
 #	The columns are:
 #
-#	TYPE	    --	must start in column 1 and be "ipsec", "ipsecnat","ip"
+#	TYPE	    --	must start in column 1 and be "ipsec", "ipsecnat","ipip"
 #			"gre", "6to4", "pptpclient", "pptpserver", "openvpn" or 
 #			"generic"
 #