[Pkg-openldap-devel] [openldap] 04/05: recommend mdb for new installations

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit c19c7a4d4981ee63bff1918541a8de40073c0886
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun Oct 19 15:43:03 2014 -0700

    recommend mdb for new installations
---
 debian/changelog           | 1 +
 debian/slapd.README.Debian | 7 +++----
 debian/slapd.templates     | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a93345e..b7e71a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ openldap (2.4.40-2) UNRELEASED; urgency=medium
     dpkg-buildflags. Spotted by Lintian.
   * debian/slapd.init.ldif: Don't bother explicitly granting rights to the
     rootdn, since it already has unlimited privileges. Thanks Ferenc Wagner.
+  * Recommend MDB for new installations, per upstream's recommendation.
 
  -- Ryan Tandy <ryan at nardis.ca>  Sun, 19 Oct 2014 17:34:00 -0700
 
diff --git a/debian/slapd.README.Debian b/debian/slapd.README.Debian
index 632727e..85e2b11 100644
--- a/debian/slapd.README.Debian
+++ b/debian/slapd.README.Debian
@@ -33,8 +33,7 @@ The OpenLDAP configuration
 Using the MDB Backend
 
   MDB is a new database backend using the LMDB library created by the
-  OpenLDAP developers. It will become the default backend in a future
-  version of OpenLDAP. The MDB backend has fewer configuration
+  OpenLDAP developers. The MDB backend has fewer configuration
   parameters than HDB/BDB and generally does not require hand tuning.
 
   The database is stored in a sparse file with a specified maximum size.
@@ -48,8 +47,8 @@ Using the MDB Backend
 
 Using BDB/HDB Backends
 
-  HDB is the recommended database backend.  It's the same as BDB but
-  allows some additional operations.
+  HDB was the recommended backend before MDB was developed. It's the
+  same as BDB but allows some additional operations.
    
   slapd BDB and HDB backends rely on libdb to store data on your disks.
   libdb uses a configuration file to tune database specific
diff --git a/debian/slapd.templates b/debian/slapd.templates
index 3fd2b0d..c038c5e 100644
--- a/debian/slapd.templates
+++ b/debian/slapd.templates
@@ -132,13 +132,12 @@ _Description: slapcat failure during upgrade
 Template: slapd/backend
 Type: select
 Choices: BDB, HDB, MDB
-Default: HDB
+Default: MDB
 _Description: Database backend to use:
- The HDB backend is recommended. HDB and BDB use similar storage formats,
- but HDB adds support for subtree renames. Both support the same
- configuration options.
+ HDB and BDB use similar storage formats, but HDB adds support for
+ subtree renames. Both support the same configuration options.
  .
- The MDB backend is a new backend using a different storage format. It
+ The MDB backend is recommended. MDB uses a new storage format and
  requires less configuration than BDB or HDB.
  .
  In any case, you should review the resulting database configuration for

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git