rpms/squid/devel squid.init,1.12,1.13 squid.spec,1.121,1.122

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17835

Modified Files:
	squid.init squid.spec 
Log Message:
* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
- fixed ambiguous condition in the init script (exit 4)



Index: squid.init
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- squid.init	8 Oct 2008 06:45:52 -0000	1.12
+++ squid.init	28 Apr 2009 09:11:55 -0000	1.13
@@ -50,7 +50,7 @@ probe() {
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 1
 
-	[ -z "$SQUID" ] && exit 4
+	[ `id -u` -ne 0 ] && exit 4
 
 	# check if the squid conf file is present
 	[ -f $SQUID_CONF ] || exit 6


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- squid.spec	20 Apr 2009 17:21:19 -0000	1.121
+++ squid.spec	28 Apr 2009 09:11:55 -0000	1.122
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.0.STABLE14
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -338,6 +338,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 28 2009 Jiri Skala <jskala at redhat.com> - 3.0.STABLE14-3
+- fixed ambiguous condition in the init script (exit 4)
+
 * Mon Apr 20 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"