From a52bc4a97eac2f6d00c4c9f2ead284828aaa7b0a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 15 May 2005 16:43:18 +0000
Subject: [PATCH] =?UTF-8?q?Add=20Patrik=20Varmeck=EF=BF=BD=EF=BF=BD's=20Tu?=
 =?UTF-8?q?nnel=20patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/STABLE2/changelog.txt b/STABLE2/changelog.txt
index 52958a7a5..35522d62f 100644
--- a/STABLE2/changelog.txt
+++ b/STABLE2/changelog.txt
@@ -2,6 +2,8 @@ Changes in 2.2.5
 
 1) Correct behavior of PKTTYPE=No
 
+2) Fixed typo in the tunnel script.
+
 Changes in 2.2.4
 
 1) Added support for UPnP
diff --git a/STABLE2/releasenotes.txt b/STABLE2/releasenotes.txt
index d60b6aab5..f9a4965cd 100644
--- a/STABLE2/releasenotes.txt
+++ b/STABLE2/releasenotes.txt
@@ -6,6 +6,9 @@ Problems corrected in version 2.2.5
 1) Previously, if PKTTYPE=No in shorewall.conf then pkttype match would
    still be used if the kernel supported it.
 
+2) A typo in the 'tunnel' script has been corrected (Thanks to Patrik
+   Varmecký).
+
 -----------------------------------------------------------------------
 Problems corrected in version 2.2.4
 
diff --git a/STABLE2/tunnel b/STABLE2/tunnel
index cd84d7806..5aedabbca 100755
--- a/STABLE2/tunnel
+++ b/STABLE2/tunnel
@@ -108,7 +108,7 @@ do_start() {
 
       case $tunnel_type in
       gre)
-          ip tunnel add $tunnel mode gre remote $gateway local $myrealip ttl 255 ${key:+key $key)
+          ip tunnel add $tunnel mode gre remote $gateway local $myrealip ttl 255 ${key:+key $key}
 	  ;;
       *)
           ip tunnel add $tunnel mode ipip remote $gateway