- fixed ambiguous condition in the init script (exit 4)

squid.init

@@ -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

squid.spec

@@ -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@redhat.com> - 3.0.STABLE14-3
+- fixed ambiguous condition in the init script (exit 4)
+
 * Mon Apr 20 2009 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.0.STABLE14-2
 - Squid bug #2635: assertion failed: HttpHeader.cc:1196: "Headers[id].type == ftInt64"