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

[matthijs at alioth.debian.org]

tags 490930 pending
thanks

Author: matthijs
Date: 2010-04-14 20:46:04 +0000 (Wed, 14 Apr 2010)
New Revision: 1256

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/configure.options
   openldap/trunk/debian/slapd.scripts-common
Log:
 * Enable dynamic acls
 * Use slappasswd to create the admin password (the default SSHA is more secure)


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-04-14 07:43:46 UTC (rev 1255)
+++ openldap/trunk/debian/changelog	2010-04-14 20:46:04 UTC (rev 1256)
@@ -13,11 +13,13 @@
   * Improve the wording for the slapd/invalid_config question (Closes: #452834)
   * Make lintian a bit more happy (Closes: #518660)
   * Fix bashism (Closes: #518657)
-  * Refresh all patches.
+  * Refresh all patches
   * Add patch from upstream (Closes: #549642)
-  * Reworked the configure.options a bit to include some more options.
+  * Reworked the configure.options a bit to include some more options
+  * Enable dynamic acls
+  * Use slappasswd to create a secure password (Closes: #490930)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Tue, 13 Apr 2010 21:52:20 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Wed, 14 Apr 2010 22:30:05 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Modified: openldap/trunk/debian/configure.options
===================================================================
--- openldap/trunk/debian/configure.options	2010-04-14 07:43:46 UTC (rev 1255)
+++ openldap/trunk/debian/configure.options	2010-04-14 20:46:04 UTC (rev 1256)
@@ -87,6 +87,7 @@
 #  --enable-slapd	  enable building slapd [yes]
 --enable-slapd
 #    --enable-dynacl	  enable run-time loadable ACL support (experimental) [no]
+--enable-dynacl
 #    --enable-aci	  enable per-object ACIs (experimental) no|yes|mod [no]
 --enable-aci
 #    --enable-cleartext	  enable cleartext passwords [yes]

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-04-14 07:43:46 UTC (rev 1255)
+++ openldap/trunk/debian/slapd.scripts-common	2010-04-14 20:46:04 UTC (rev 1256)
@@ -759,7 +759,7 @@
 		objectClass: organizationalRole
 		cn: admin
 		description: LDAP administrator
-		userPassword: {crypt}$adminpass
+		userPassword: $adminpass
 	EOF
 
 	echo "done." >&2
@@ -937,28 +937,8 @@
 # Create the password hash for the given password
 # Usage: hash=`create_password_hash "$password"`
 
-  	perl - "$1" <<'EOF'
-# ---------------
-sub GenRandom {
-	local ($len) = @_;
-      	local ($char, $data, @chars);
-      	@chars = split(//, "abcdefghijklmnopqrstuvwxyz"
-                         . "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
-    
-      	open(RD, "</dev/urandom") or die "Failed to open random source";
-      	$data = "";
-      	while ($len--) {
-        	read(RD, $char, 1) == 1 or die "Failed to read random data";
-		$data .= $chars[ord($char) % @chars];
-      	}
-    
-      	close(RD);
-      	return $data;
+	slappasswd -s $1
 }
-print crypt($ARGV[0], GenRandom(2));
-EOF
-# --------------
-}
 
 # }}}
 previous_version_older() {						# {{{