[Pkg-openldap-devel] r702 - openldap/trunk-2.3/debian

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-07-26 16:06:15 +0000 (Wed, 26 Jul 2006)
New Revision: 702

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/slapd.postinst
   openldap/trunk-2.3/debian/slapd.preinst
Log:
 * Revert commit 699.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-07-25 21:43:14 UTC (rev 701)
+++ openldap/trunk-2.3/debian/changelog	2006-07-26 16:06:15 UTC (rev 702)
@@ -17,13 +17,10 @@
   * Removed script move_files, dh_install is used instead. (Closes: #368896)
   * Dutch translation already updated. Closes: #375101)
   * Documented that slapd is compiled with TCP wrappers (Closes: #351428)
-  * Create a new user before slapd is stopped. It is possible that libnss-ldap
-    is using slapd on localhost which causes a hang in the upgrade procedure.
-    (Closes: #379728)
   * dpkg-reconfigure slapd now just reinstalls slapd and moves old databases
     to /var/backups. Already done in previous version (Closes: #230366, #208056)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Tue, 25 Jul 2006 21:41:19 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Wed, 26 Jul 2006 18:05:40 +0200
 
 openldap2.3 (2.3.24-2) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/slapd.postinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.postinst	2006-07-25 21:43:14 UTC (rev 701)
+++ openldap/trunk-2.3/debian/slapd.postinst	2006-07-26 16:06:15 UTC (rev 702)
@@ -69,6 +69,11 @@
 
 # }}}
 
+# Create a new user
+if [ "$MODE" = "configure" ]; then
+	create_new_user
+fi
+
 # Configuration.
 if is_initial_configuration "$@"; then
 	postinst_initial_configuration

Modified: openldap/trunk-2.3/debian/slapd.preinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.preinst	2006-07-25 21:43:14 UTC (rev 701)
+++ openldap/trunk-2.3/debian/slapd.preinst	2006-07-26 16:06:15 UTC (rev 702)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 
 set -e
 
@@ -8,17 +8,10 @@
 # various helper functions and $OLD_VERSION and $SLAPD_CONF
 #SCRIPTSCOMMON#
 
-# When slapd is down we can't retrieve data from slapd (how obvious) somehow
-# libnss-ldap is doing weird. It doesn't listen that a connection is refused and
-# tries again. (My understanding of it)
-if [ "$MODE" = "install" ] || [ "$MODE" = "upgrade" ]; then
-	create_new_user
-fi
-
 # If we are upgrading from an old version then stop slapd and attempt to
 # slapcat out the data so we can use it in postinst to do the upgrade
 
-if [ "$MODE" = "upgrade" ]; then
+if [ "$MODE" = upgrade ]; then
 	stop_slapd
 	dump_databases
 fi