From 37a7ed74cbedb056465f3fc1f5b20a7ecd97f588 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzeleny@fedoraproject.org>
Date: Nov 23 2009 12:51:49 +0000
Subject: minor corrections of init script


---

diff --git a/ldap.init b/ldap.init
index 185e5b7..5b82d54 100644
--- a/ldap.init
+++ b/ldap.init
@@ -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}
diff --git a/openldap.spec b/openldap.spec
index 28e0ee9..d64a8a2 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -633,6 +633,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Nov 23 2009 Jan Zeleny <jzeleny@redhat.com> - 2.4.19-3
+- minor corrections in init script
+
 * Mon Nov 16 2009 Jan Zeleny <jzeleny@redhat.com> - 2.4.19-2
 - fixed tls connection accepting when TLSVerifyClient = allow
 - /etc/openldap/ldap.conf removed from files owned by openldap-servers