From b0b5a067d79cb2b6f99cb49754dd5deb133b397e Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 17 Apr 2007 18:02:58 +0000
Subject: [PATCH] Fix stupid bugs

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5981 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/releasenotes.txt | 2 +-
 Shorewall-common/shorewall        | 6 +-----
 Shorewall-shell/compiler          | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index 32415bc42..7427eb8a7 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -353,7 +353,7 @@ on the SHOREWALL_COMPILER setting in shorewall.conf.
 
 The value of this new option can be either 'perl' or 'shell'.
 
-If you add 'SHOREWALL_COMPILER=shell' to /etc/shorewall/shorewall.conf
+If you add 'SHOREWALL_COMPILER=perl' to /etc/shorewall/shorewall.conf
 then by default, the new compiler will be used on the system. If you
 add it to shorewall.conf in a separate directory (such as a
 Shorewall-lite export directory) then the new compiler will only be
diff --git a/Shorewall-common/shorewall b/Shorewall-common/shorewall
index 5fecb223e..9a345e404 100755
--- a/Shorewall-common/shorewall
+++ b/Shorewall-common/shorewall
@@ -247,11 +247,7 @@ compiler() {
     if [ -n "$SHOREWALL_COMPILER" ]; then
 	compiler="$SHOREWALL_COMPILER"
     elif [ -x $sc ]; then
-	if [ -x $pc ]; then
-	    compiler=
-	else
-	    compiler=shell
-	fi
+	compiler=shell
     elif [ -x $pc ]; then
 	compiler=perl
     else
diff --git a/Shorewall-shell/compiler b/Shorewall-shell/compiler
index 5ba533152..8c67972c9 100755
--- a/Shorewall-shell/compiler
+++ b/Shorewall-shell/compiler
@@ -3715,7 +3715,7 @@ __EOF__
 
 	save_progress_message "Setting up Route Filtering..."
 
-	if [ -z "$ROUTE_FILTER" ]; THEN
+	if [ -z "$ROUTE_FILTER" ]; then
 	    indent >&3 << __EOF__
 
 for f in /proc/sys/net/ipv4/conf/*; do