From 2da69bd0b7fff9c4df05fa4453f8551af0eb1be6 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 5 May 2007 00:02:21 +0000
Subject: [PATCH] More openvpn changes

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6243 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Rules.pm   | 2 +-
 Shorewall-perl/Shorewall/Tunnels.pm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm
index 44335395e..bcdd51d33 100644
--- a/Shorewall-perl/Shorewall/Rules.pm
+++ b/Shorewall-perl/Shorewall/Rules.pm
@@ -950,7 +950,7 @@ sub process_rule1 ( $$$$$$$$$$ ) {
     }
 
     fatal_error "Missing source zone" if $sourcezone eq '-';
-    fatal_error "Unknown source zone ($sourcezone)"    unless $zones{$sourcezone};
+    fatal_error "Unknown source zone ($sourcezone)" unless $zones{$sourcezone};
     fatal_error "Missing destination zone" if $destzone eq '-';
     fatal_error "Unknown destination zone ($destzone)" unless $zones{$destzone};
 
diff --git a/Shorewall-perl/Shorewall/Tunnels.pm b/Shorewall-perl/Shorewall/Tunnels.pm
index de151f1b2..6ec26303f 100644
--- a/Shorewall-perl/Shorewall/Tunnels.pm
+++ b/Shorewall-perl/Shorewall/Tunnels.pm
@@ -127,7 +127,7 @@ sub setup_tunnels() {
 
 	( $kind, my ( $proto, $p ) ) = split /:/, $kind;
 
-	if ( $p ) {
+	if ( defined $p && $p ne '' ) {
 	    $port = $p;
 	    $protocol = $proto;
 	} elsif ( $proto ) {
@@ -150,7 +150,7 @@ sub setup_tunnels() {
 
 	( $kind, my ( $proto, $p ) ) = split /:/, $kind;
 
-	if ( $p ) {
+	if ( defined $p && $p ne '' ) {
 	    $port = $p;
 	    $protocol = $proto;
 	} elsif ( $proto ) {
@@ -173,7 +173,7 @@ sub setup_tunnels() {
 
 	( $kind, my ( $proto, $p ) ) = split /:/, $kind;
 
-	if ( $p ) {
+	if ( defined $p && $p ne '' ) {
 	    $port = $p;
 	    $protocol = $proto;
 	} elsif ( $proto ) {