rpms/openldap/F-12 ldap.init,1.35,1.36 openldap.spec,1.154,1.155

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/openldap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17319

Modified Files:
	ldap.init openldap.spec 
Log Message:
minor changes in init script


Index: ldap.init
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-12/ldap.init,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- ldap.init	18 Nov 2009 15:33:17 -0000	1.35
+++ ldap.init	23 Nov 2009 13:12:30 -0000	1.36
@@ -231,26 +231,12 @@ case "$1" in
 	configtest
 	;;
     start)
-	msg=`status -p $pidfile ${slapd} > /dev/null 2>&1`
+	start
 	RETVAL=$?
-	if [ "$RETVAL" = "0" ]; then
-		echo $msg
-		RETVAL=1
-	else
-		start
-		RETVAL=$?
-	fi
 	;;
     stop)
-	msg=`status -p $pidfile ${slapd} > /dev/null 2>&1`
+	stop
 	RETVAL=$?
-	if [ "$RETVAL" != "0" ]; then
-		echo $msg
-		RETVAL=7
-	else
-		stop
-		RETVAL=$?
-	fi
 	;;
     status)
 	status -p $pidfile ${slapd}


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/F-12/openldap.spec,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -p -r1.154 -r1.155
--- openldap.spec	18 Nov 2009 15:33:17 -0000	1.154
+++ openldap.spec	23 Nov 2009 13:12:30 -0000	1.155
@@ -633,6 +633,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Nov 23 2009 Jan Zeleny <jzeleny at redhat.com> - 2.4.19-2
+- minor changes in init script
+
 * Wed Nov 18 2009 Jan Zeleny <jzeleny at redhat.com> - 2.4.19-1
 - fixed tls connection accepting when TLSVerifyClient = allow
 - /etc/openldap/ldap.conf removed from files owned by openldap-servers