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

[rra at alioth.debian.org]

tags 452438 pending
thanks

Author: rra
Date: 2008-02-15 01:43:46 +0000 (Fri, 15 Feb 2008)
New Revision: 1102

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.postinst
Log:
* Don't create the openldap user if slapd has been configured to run as
  a different user.  If slapd has been configured to run as openldap, do
  create the user on reconfigure.  Closes: #452438.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-02-15 01:31:20 UTC (rev 1101)
+++ openldap/trunk/debian/changelog	2008-02-15 01:43:46 UTC (rev 1102)
@@ -21,6 +21,9 @@
   [ Russ Allbery ]
   * Add a stamp file for the configure rule to avoid rerunning configure
     needlessly.  Closes: #465588.
+  * Don't create the openldap user if slapd has been configured to run as
+    a different user.  If slapd has been configured to run as openldap, do
+    create the user on reconfigure.  Closes: #452438.
   * Reformat, reorganize, and update slapd's README.Debian.
     - Include SASL configuration information.
     - Remove LDBM information, since upstream no longer even ships LDBM

Modified: openldap/trunk/debian/slapd.postinst
===================================================================
--- openldap/trunk/debian/slapd.postinst	2008-02-15 01:31:20 UTC (rev 1101)
+++ openldap/trunk/debian/slapd.postinst	2008-02-15 01:43:46 UTC (rev 1102)
@@ -83,9 +83,12 @@
 
 # }}}
 
-# Create a new user
-if [ "$MODE" = "configure" ]; then
-	create_new_user
+# Create a new user.  Don't create the user, however, if the local
+# administrator has already customized slapd to run as a different user.
+if [ "$MODE" = "configure" ] || [ "$MODE" = "reconfigure" ] ; then
+	if [ "openldap" = "$SLAPD_USER" ] ; then
+		create_new_user
+	fi
 fi
 
 # Configuration.