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

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-07-15 18:12:45 +0000 (Sat, 15 Jul 2006)
New Revision: 684

Modified:
   openldap/trunk-2.3/debian/slapd.postinst
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
 * Move database away function broke the upgrade, it moved also the toplevel
   directory away.
 * Fixed a few issues for upgrading from Sarge to sid.


Modified: openldap/trunk-2.3/debian/slapd.postinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.postinst	2006-07-15 18:11:28 UTC (rev 683)
+++ openldap/trunk-2.3/debian/slapd.postinst	2006-07-15 18:12:45 UTC (rev 684)
@@ -36,6 +36,16 @@
 	fi
 	update_access_config_directives
 
+	if previous_version_older 2.3.24-2; then
+		update_path_argsfile
+
+		# Directory /var/run/slapd is suddenly gone, dpkg removes it because it's
+		# now generated from the postinst scripts. See create_ldap_directories.
+		if [ ! -d "/var/run/slapd" ]; then
+			mkdir -m 0755 /var/run/slapd
+		fi
+	fi
+
 	if database_format_changed; then
 		# During upgrading we have to load the old data
 		move_incompatible_databases_away
@@ -50,16 +60,6 @@
 		load_databases
 	fi
 
-	if previous_version_older 2.3.24-2; then
-		update_path_argsfile
-
-		# Directory /var/run/slapd is suddenly gone, dpkg removes it because it's
-		# now generated from the postinst scripts. See create_ldap_directories.
-		if [ ! -d "/var/run/slapd" ]; then
-			mkdir -m 0755 /var/run/slapd
-		fi
-	fi
-
 	# Update permissions of all database directories and /var/run/slapd,
 	# /var/spool/slurpd
 	update_databases_permissions

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2006-07-15 18:11:28 UTC (rev 683)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2006-07-15 18:12:45 UTC (rev 684)
@@ -563,7 +563,7 @@
 		backupdir=`compute_backup_path "$databasedir" "$suffix"`
 		echo -n "  - directory $suffix... " >&2
 		mkdir -p "$backupdir"
-		find "$databasedir" -depth -exec mv {} "$backupdir" \;
+		find "$databasedir"/* -depth -exec mv {} "$backupdir" \;
 		echo done. >&2
 	else
 		cat >&2 <<EOF
@@ -862,9 +862,9 @@
 # access to dn=".*,..." becomes access to dn.regex=".*,..."
 
 	# Check if we have to apply these changes
-	# First changed in Debian release 2.2.23, better update if we are
-	# upgrading something older.
-	if previous_version_newer 2.2.23; then
+	# Users can have it in the config file. 2.2.26 allowed to have attr in the
+	# config files due to a bug in the config parser.
+	if previous_version_newer 2.3.24; then
 		return 0
 	fi