From f11178c13a46d7a2cb58599fea5b3b5c0726a0cc Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@fedoraproject.org>
Date: Wed, 25 Oct 2006 11:39:25 +0000
Subject: [PATCH] added fix for #183869 - squid can abort when getting status

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

diff --git a/squid.init b/squid.init
index 7c15ae8..a3e03c3 100644
--- a/squid.init
+++ b/squid.init
@@ -119,8 +119,7 @@ condrestart() {
 }
 
 rhstatus() { 
-    status $SQUID
-    $SQUID -k check
+    status $SQUID && $SQUID -k check
 }
 
 probe() {
diff --git a/squid.spec b/squid.spec
index 022aa23..ca0703d 100644
--- a/squid.spec
+++ b/squid.spec
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -349,6 +349,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 25 2006 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE4-3
+- added fix for #183869 - squid can abort when getting status
+
 * Tue Oct 17 2006 Martin Stransky <stransky@redhat.com> - 7:2.6.STABLE4-2
 - upstream fixes:
   * Accept 00:00-24:00 as a valid time specification (upstream BZ #1794)