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

[matthijs at alioth.debian.org]

Author: matthijs
Date: 2010-07-23 18:44:27 +0000 (Fri, 23 Jul 2010)
New Revision: 1297

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.init
Log:
 * Revert the wait for 2 seconds, it can take up to 3 minutes before it started
   completely.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-07-23 10:34:43 UTC (rev 1296)
+++ openldap/trunk/debian/changelog	2010-07-23 18:44:27 UTC (rev 1297)
@@ -10,10 +10,8 @@
   * Update slapd.README.Debian and slapd.NEWS and note the new configuration
     style.
   * Fixes CVE-2010-0211 and CVE-2010-0212 (Closes: #589852)
-  * Add 2 second delay to the init script, so that OpenLDAP is actually
-    listening on the sockets (Closes: #589915)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri, 23 Jul 2010 12:27:11 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Fri, 23 Jul 2010 20:43:08 +0200
 
 openldap (2.4.23-2) unstable; urgency=medium
 

Modified: openldap/trunk/debian/slapd.init
===================================================================
--- openldap/trunk/debian/slapd.init	2010-07-23 10:34:43 UTC (rev 1296)
+++ openldap/trunk/debian/slapd.init	2010-07-23 18:44:27 UTC (rev 1297)
@@ -135,10 +135,6 @@
 	if [ ! -h /var/run/ldapi ] && [ ! -e /var/run/ldapi ] ; then
 		ln -s slapd/ldapi /var/run/ldapi
 	fi
-
-	# Sleep for two seconds to have OpenLDAP operational when exiting this init
-	# script
-	sleep 2
 }
 
 # Stop the slapd daemon and capture the error message (if any) to