From 179625239c569ec1d8b070d1a30f97b936d86609 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 20 Feb 2007 17:52:29 +0000
Subject: [PATCH] Fix exit status from start/restart

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

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 40bef0610..b14795a8b 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -6,6 +6,8 @@ Changes in 3.4.0 Final
 
 3)  Fix restoration of ip range dynamic entries.
 
+4)  Fix exit status problem with 'restart'
+
 Changes in 3.4.0 RC 2
 
 1)  No longer include params file in compiled output.
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index d21b87b46..75d887064 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -37,6 +37,9 @@ Problems Corrected in 3.4.0 Final
     time that Shorewall was restarted, new connections from outside the
     firewall were totally blocked.
 
+3)  If a 'shorewall restart' command failed during the compile phase, 
+    /sbin/shorewall erroneously returned an exit status of 0.
+
 Other Changes in 3.4.0 Final
 
 1)  A warning is now issued when 'loose' and 'balance' are specified together
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index d08577a89..1579fca36 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -550,8 +550,8 @@ restart_command() {
 	$SHOREWALL_SHELL ${VARDIR}/.restart $debugging restart
 	rc=$?
     else
-	logger -p kern.err "ERROR:Shorewall restart failed"
 	rc=$?
+	logger -p kern.err "ERROR:Shorewall restart failed"
     fi
 
     [ -n "$nolock" ] || mutex_off