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

[Steve Langasek]

Author: vorlon
Date: 2007-02-19 12:57:26 +0100 (Mon, 19 Feb 2007)
New Revision: 779

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/slapd.scripts-common
Log:
Ok, argh, it helps to check that the function being re-added to the preinst
hasn't been removed again from the common include.  Re-add
break_on_ldbm_to_bdb_migration_disagree, because by all appearances we
/should/ be using this in the preinst.  Closes: #411474.



Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-02-19 01:57:51 UTC (rev 778)
+++ openldap/trunk-2.3/debian/changelog	2007-02-19 11:57:26 UTC (rev 779)
@@ -1,3 +1,12 @@
+openldap2.3 (2.3.30-4) unstable; urgency=low
+
+  * Ok, argh, it helps to check that the function being re-added to the
+    preinst hasn't been removed again from the common include.  Re-add 
+    break_on_ldbm_to_bdb_migration_disagree, because by all appearances
+    we /should/ be using this in the preinst.  Closes: #411474.
+
+ -- Steve Langasek <vorlon at debian.org>  Mon, 19 Feb 2007 03:55:22 -0800
+
 openldap2.3 (2.3.30-3) unstable; urgency=medium
 
   [ Matthijs Mohlmann ]

Modified: openldap/trunk-2.3/debian/slapd.scripts-common
===================================================================
--- openldap/trunk-2.3/debian/slapd.scripts-common	2007-02-19 01:57:51 UTC (rev 778)
+++ openldap/trunk-2.3/debian/slapd.scripts-common	2007-02-19 11:57:26 UTC (rev 779)
@@ -71,6 +71,20 @@
     db_input medium slapd/allow_ldap_v2 || true
 }
 # }}}
+break_on_ldbm_to_bdb_migration_disagree() { # {{{
+  if [ -e "$SLAPD_CONF" ] && grep -qE \
+      -e '^moduleload[[:space:]]+back_ldbm' \
+      -e '^(database|backend)[[:space:]]+ldbm' \
+      "$SLAPD_CONF"; then
+    db_get slapd/migrate_ldbm_to_bdb
+    if [ "$RET" = "false" ]; then
+      db_fset slapd/migrate_ldbm_to_bdb seen false
+      return 1
+    fi
+    return 0
+  fi
+  return 0
+} # }}}
 database_dumping_enabled() {						# {{{
 # Check if the user has enabled database dumping for the current situation.
 # Return success if yes.