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

[Steve Langasek]

Author: vorlon
Date: 2007-02-17 05:52:06 +0100 (Sat, 17 Feb 2007)
New Revision: 772

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/slapd.preinst
Log:
*Really* abort in preinst if the user doesn't accept the upgrade from ldbm to
bdb.  Closes: #392747.



Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-12-23 21:38:53 UTC (rev 771)
+++ openldap/trunk-2.3/debian/changelog	2007-02-17 04:52:06 UTC (rev 772)
@@ -1,5 +1,6 @@
 openldap2.3 (2.3.30-3) unstable; urgency=medium
 
+  [ Matthijs Mohlmann ]
   * Added spanish translation. (Closes: #404250)
   * Documentation updates backported from upstream.
   * Fix a security bug in kerberos kbind code. (Only used when enabling with
@@ -7,8 +8,12 @@
   * Backported a mem leak fix on failed binds.
   * Added patch from upstream that fixes a memory leak in ACLs that use sets.
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sat, 23 Dec 2006 22:37:45 +0100
+  [ Steve Langasek ]
+  * *Really* abort in preinst if the user doesn't accept the upgrade
+    from ldbm to bdb.  Closes: #392747.
 
+ -- Steve Langasek <vorlon at debian.org>  Fri, 16 Feb 2007 20:32:57 -0800
+
 openldap2.3 (2.3.30-2) unstable; urgency=low
 
   * Make sure that the pidfile directory doesn't exist in the init script.

Modified: openldap/trunk-2.3/debian/slapd.preinst
===================================================================
--- openldap/trunk-2.3/debian/slapd.preinst	2006-12-23 21:38:53 UTC (rev 771)
+++ openldap/trunk-2.3/debian/slapd.preinst	2007-02-17 04:52:06 UTC (rev 772)
@@ -12,6 +12,7 @@
 # slapcat out the data so we can use it in postinst to do the upgrade
 
 if [ "$MODE" = upgrade ]; then
+	break_on_ldbm_to_bdb_migration_disagree
 	stop_slapd
 	dump_databases
 fi