[Pkg-openldap-devel] [openldap] 05/05: don't needlessly re-create default DB_CONFIG

[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 60dc22354a1eb543415b0047754d1e8c7036aeed
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Mon Oct 20 06:56:37 2014 -0700

    don't needlessly re-create default DB_CONFIG
    
    mdb users don't want it created, and bdb/hdb users can have it created
    from olcDbConfig directives if it goes missing.
---
 debian/changelog            | 2 ++
 debian/slapd.scripts-common | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7e71a5..9a14dbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ openldap (2.4.40-2) UNRELEASED; urgency=medium
   * 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.
+  * Don't re-create the default DB_CONFIG if there wasn't one in the backup,
+    for example if the active backend doesn't use it. Thanks Ferenc Wagner.
 
  -- Ryan Tandy <ryan at nardis.ca>  Sun, 19 Oct 2014 17:34:00 -0700
 
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index aed17e4..f56b3b1 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -213,8 +213,6 @@ load_databases() {							# {{{
 		backupdir=`compute_backup_path -n "$dbdir" "$suffix"`
 		if [ -e "$backupdir"/DB_CONFIG ]; then
 			cp -a "$backupdir"/DB_CONFIG "$dbdir"/
-		else
-			copy_example_DB_CONFIG "$dbdir"/
 		fi
 
 		if [ -f "${SLAPD_CONF}" ]; then

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