[Pkg-openldap-devel] r1236 - openldap/trunk/debian

[vorlon at alioth.debian.org]

tags 545898 pending
thanks

Author: vorlon
Date: 2009-09-10 00:38:37 +0000 (Thu, 10 Sep 2009)
New Revision: 1236

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/control
   openldap/trunk/debian/slapd.init
Log:
Add 'status' argument to init script; thanks to Peter Eisentraut
<petere at debian.org>.  Closes: #545898.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2009-08-06 11:47:15 UTC (rev 1235)
+++ openldap/trunk/debian/changelog	2009-09-10 00:38:37 UTC (rev 1236)
@@ -7,6 +7,8 @@
     - bump Standards-Version to 3.8.2, no changes required.
   * slapd.scripts-common: fix upgrade to correctly handle multiple database
     declarations; thanks, Peter Marschall <peter at adpm.de>!  Closes: #517556
+  * Add 'status' argument to init script; thanks to Peter Eisentraut
+    <petere at debian.org>.  Closes: #545898.
 
  -- Steve Langasek <vorlon at debian.org>  Tue, 28 Jul 2009 18:03:26 -0700
 

Modified: openldap/trunk/debian/control
===================================================================
--- openldap/trunk/debian/control	2009-08-06 11:47:15 UTC (rev 1235)
+++ openldap/trunk/debian/control	2009-09-10 00:38:37 UTC (rev 1236)
@@ -26,7 +26,7 @@
 Pre-Depends: debconf (>= 0.5) | debconf-2.0
 Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}),
  coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl,
- adduser, ${misc:Depends}
+ adduser, lsb-base (>= 3.2-13), ${misc:Depends}
 Recommends: libsasl2-modules
 Suggests: ldap-utils
 Conflicts: umich-ldapd, ldap-server, libltdl3 (= 1.5.4-1)

Modified: openldap/trunk/debian/slapd.init
===================================================================
--- openldap/trunk/debian/slapd.init	2009-08-06 11:47:15 UTC (rev 1235)
+++ openldap/trunk/debian/slapd.init	2009-09-10 00:38:37 UTC (rev 1236)
@@ -11,6 +11,8 @@
 # Specify path variable
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 
+. /lib/lsb/init-functions
+
 # Kill me on all errors
 set -e
 
@@ -196,8 +198,11 @@
   	stop_ldap
 	start_ldap
 	;;
+  status)
+	status_of_proc -p $SLAPD_PIDFILE $SLAPD slapd
+	;;
   *)
-  	echo "Usage: $0 {start|stop|restart|force-reload}"
+  	echo "Usage: $0 {start|stop|restart|force-reload|status}"
 	exit 1
 	;;
 esac