rpms/openldap/devel ldap.init,1.29,1.30 openldap.spec,1.113,1.114

[Jan Šafránek (jsafrane)]

Author: jsafrane

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

Modified Files:
	ldap.init openldap.spec 
Log Message:
init script fixes


Index: ldap.init
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/ldap.init,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ldap.init	28 Jan 2008 11:45:46 -0000	1.29
+++ ldap.init	28 Jan 2008 12:12:02 -0000	1.30
@@ -41,6 +41,7 @@
 slaptest=/usr/sbin/slaptest
 lockfile=/var/lock/subsys/ldap
 configfile=/etc/openldap/slapd.conf
+pidfile=/var/run/openldap/slapd.pid
 
 RETVAL=0
 
@@ -176,7 +177,7 @@
 	fi
 	# Start daemons.
 	echo -n $"Starting $prog: "
-	daemon --check=$prog ${slapd} -h "\"$harg\"" -u ${user} $OPTIONS $SLAPD_OPTIONS 
+	daemon --pidfile=$pidfile --check=$prog ${slapd} -h "\"$harg\"" -u ${user} $OPTIONS $SLAPD_OPTIONS 
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch $lockfile
 	echo
@@ -187,7 +188,7 @@
 	# Stop daemons.
 	prog=`basename ${slapd}`
 	echo -n $"Stopping $prog: "
-	killproc ${slapd}
+	killproc -p $pidfile ${slapd}
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && rm -f $lockfile /var/run/slapd.args
 	echo
@@ -208,7 +209,7 @@
 	RETVAL=$?
 	;;
     status)
-	status ${slapd}
+	status -p $pidfile ${slapd}
 	RETVAL=$?
 	;;
     restart|force-reload)


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- openldap.spec	28 Jan 2008 11:45:46 -0000	1.113
+++ openldap.spec	28 Jan 2008 12:12:02 -0000	1.114
@@ -9,7 +9,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -605,6 +605,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Jan 28 2008 Jan Safranek <jsafranek at redhat.com> 2.4.7-6
+- init script fixes
+
 * Mon Jan 28 2008 Jan Safranek <jsafranek at redhat.com> 2.4.7-5
 - init script made LSB-compliant (#247012)