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

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-02-18 17:41:59 +0000 (Sat, 18 Feb 2006)
New Revision: 620

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/control
   openldap/trunk-2.3/debian/slapd.preinst
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
 * Remove libldap2.3-dev before someone accidently builds against it.
 * Added debhelper token to slapd.preinst
 * Wipe the passwords after the directory is created.
 * Update changelog


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-02-18 15:48:54 UTC (rev 619)
+++ openldap/trunk-2.3/debian/changelog	2006-02-18 17:41:59 UTC (rev 620)
@@ -11,12 +11,17 @@
   * Move to quilt patch system.
   * Fix manpage.
   * Make ldiftopasswd and fix_ldif executable. (fixes lintian warnings)
+  * Wipe passwords after we created the initial configuration.
+  * The config scripts is runned twice, this causes the password in
+    slapd/internal/adminpw to be empty. This fixes the issue with having an
+    empty password in the ldap database. (Closes: #343113, #347725)
+  * Added #DEBHELPER# token to fix a lintian warning.
 
   [ Steve Langasek ]
   * debian/slapd.templates: Fix typo durin -> during; re-run
     debconf-updatepo, fixing up the fuzzies (closes: #319596).
 
- -- Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org>  Sat, 18 Feb 2006 16:46:10 +0100
+ -- Debian OpenLDAP Maintainers <pkg-openldap-devel at lists.alioth.debian.org>  Sat, 18 Feb 2006 18:04:25 +0100
 
 openldap2.2 (2.2.26-4) unstable; urgency=low
 

Modified: openldap/trunk-2.3/debian/control
===================================================================
--- openldap/trunk-2.3/debian/control	2006-02-18 15:48:54 UTC (rev 619)
+++ openldap/trunk-2.3/debian/control	2006-02-18 17:41:59 UTC (rev 620)
@@ -48,18 +48,18 @@
  These are the run-time libraries for the OpenLDAP (Lightweight Directory
  Access Protocol) servers and clients.
 
-Package: libldap2.3-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Conflicts: libldap-dev, libopenldap-dev
-Replaces: libopenldap-dev
-Provides: libldap-dev
-Depends: libldap2.3 (= ${Source-Version})
-Description: OpenLDAP development libraries
- This package allows development of LDAP applications using the OpenLDAP
- libraries. It includes headers, libraries and links to allow static and
- dynamic linking.
+#Package: libldap2.3-dev
+#Section: libdevel
+#Priority: extra
+#Architecture: any
+#Conflicts: libldap-dev, libopenldap-dev
+#Replaces: libopenldap-dev
+#Provides: libldap-dev
+#Depends: libldap2.3 (= ${Source-Version})
+#Description: OpenLDAP development libraries
+# This package allows development of LDAP applications using the OpenLDAP
+# libraries. It includes headers, libraries and links to allow static and
+# dynamic linking.
 
 #Package: libslapd2.3-dev
 #Section: libdevel

Modified: openldap/trunk-2.3/debian/slapd.preinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.preinst	2006-02-18 15:48:54 UTC (rev 619)
+++ openldap/trunk-2.3/debian/slapd.preinst	2006-02-18 17:41:59 UTC (rev 620)
@@ -16,4 +16,8 @@
 	dump_databases
 fi
 
+#DEBHELPER#
+
+exit 0
+
 # vim: set sw=8 foldmethod=marker: 

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2006-02-18 15:48:54 UTC (rev 619)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2006-02-18 17:41:59 UTC (rev 620)
@@ -527,6 +527,9 @@
 	fi
 	create_new_slapd_conf "$basedn" "$backend"
 	create_new_directory "$basedn" "$dc"
+  # Now that we created the new directory we don't need the passwords in the
+  # debconf database anymore. So wipe them.
+  wipe_admin_pass
 	copy_example_DB_CONFIG /var/lib/ldap
 }
 # }}}
@@ -948,9 +951,19 @@
 # XXX: This is the standard unix crypt. Maybe we can get something stronger?
 
   	db_get slapd/password1
-  	db_set slapd/internal/adminpw `create_password_hash "$RET"`
+    if [ -z "$RET" ]; then
+      db_set slapd/internal/adminpw `create_password_hash "$RET"`
+    fi
 }
 
+wipe_admin_pass() {
+# Remove passwords after creating the initial ldap database.
+# Usage: wipe_admin_pass
+    db_set slapd/password1 ""
+    db_set slapd/password2 ""
+    db_set slapd/internal/adminpw ""
+}
+
 # }}}
 create_password_hash() {						# {{{
 # Create the password hash for the given password