rpms/openldap/devel ldap.init,1.23,1.24 openldap.spec,1.75,1.76

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10391

Modified Files:
	ldap.init openldap.spec 
Log Message:
Fix initscript return codes
Resolves: #242667


Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ldap.init	24 May 2007 10:13:18 -0000	1.23
+++ ldap.init	25 Jun 2007 09:18:53 -0000	1.24
@@ -16,7 +16,7 @@
 # Source networking configuration and check that networking is up.
 if [ -r /etc/sysconfig/network ] ; then
 	. /etc/sysconfig/network
-	[ ${NETWORKING} = "no" ] && exit 0
+	[ ${NETWORKING} = "no" ] && exit 1
 fi
 
 # Source an auxiliary options file if we have one, and pick up OPTIONS,
@@ -29,8 +29,8 @@
 slapd=/usr/sbin/slapd
 slurpd=/usr/sbin/slurpd
 slaptest=/usr/sbin/slaptest
-[ -x ${slapd} ] || exit 0
-[ -x ${slurpd} ] || exit 0
+[ -x ${slapd} ] || exit 1
+[ -x ${slurpd} ] || exit 1
 
 RETVAL=0
 
@@ -213,24 +213,33 @@
 	;;
     start)
 	start
+	RETVAL=$?
 	;;
     stop)
 	stop
+	RETVAL=$?
 	;;
     status)
 	status ${slapd}
+	RETVAL=$?
 	if grep -q "^replogfile" /etc/openldap/slapd.conf ; then
 	    status ${slurpd}
+	    RET=$?
+	    if [ $RET -ne 0 ] ; then
+		RETVAL=$RET;
+	    fi
 	fi
 	;;
     restart)
 	stop
 	start
+	RETVAL=$?
 	;;
     condrestart)
 	if [ -f /var/lock/subsys/ldap ] ; then
 	    stop
 	    start
+	    RETVAL=$?
 	fi
 	;;
     *)


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- openldap.spec	8 Jun 2007 11:18:52 -0000	1.75
+++ openldap.spec	25 Jun 2007 09:18:53 -0000	1.76
@@ -738,6 +738,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Jun 25 2007 Jan Safranek <jsafranek at redhat.com>
+- Fix initscript return codes (#242667)
+
 * Tue May 22 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-3%{?dist}
 - do not create script in /tmp on startup (bz#188298)
 - add compat-slapcat to openldap-compat (bz#179378)