From b8b092c97f5ca81f2d6a523e5f1c85ab845ab20b Mon Sep 17 00:00:00 2001
From: Jiri Skala <jskala@fedoraproject.org>
Date: Tue, 15 Sep 2009 17:56:14 +0000
Subject: [PATCH] - fixed #521596 - wrong return code of init script

---
 squid.init | 9 ++++++---
 squid.spec | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/squid.init b/squid.init
index 5a25ae3..c6dfbc9 100644
--- a/squid.init
+++ b/squid.init
@@ -116,6 +116,9 @@ stop() {
 		echo
 	else
 		echo_failure
+		if [ ! -e /var/lock/subsys/$SQUID ]; then
+			RETVAL=0
+		fi
 		echo
 	fi
 	return $RETVAL
@@ -148,7 +151,7 @@ stop)
 	stop
 	;;
 
-reload)
+reload|force-reload)
 	reload
 	;;
 
@@ -156,7 +159,7 @@ restart)
 	restart
 	;;
 
-condrestart)
+condrestart|try-restart)
 	condrestart
 	;;
 
@@ -170,7 +173,7 @@ probe)
 	;;
 
 *)
-	echo $"Usage: $0 {start|stop|status|reload|restart|condrestart|probe}"
+	echo $"Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}"
 	exit 2
 esac
 
diff --git a/squid.spec b/squid.spec
index 3bf1d4a..45494d3 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -253,6 +253,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 15 2009 Jiri Skala <jskala@redhat.com> - 7:3.1.0.13-4
+- fixed #521596 - wrong return code of init script
+
 * Tue Sep 08 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.1.0.13-3
 - Enable squid_kerb_auth