[Pkg-openldap-devel] [openldap] 03/05: slapd.scripts-common: restore by increasing suffix path length

[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 a39d10827600d7dca40453f8b6a9f5b35620aa7f
Author: Peter Marschall <peter at adpm.de>
Date:   Sat Apr 12 18:29:32 2014 +0200

    slapd.scripts-common: restore by increasing suffix path length
    
    This should help configurations with databases glued together using the
    'subordinate' keyword / 'olcSubordinate' attribute in slapd's configuration.
    
    For more details, see 'suffix' and 'subordinate' in slapd.conf(5).
---
 debian/slapd.scripts-common | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index aaff5d0..2b7229c 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -195,7 +195,9 @@ load_databases() {							# {{{
 
 	dir=`database_dumping_destdir`
 	echo >&2 "  Loading from $dir: "
-	get_suffix | while read suffix; do
+	# restore by increasing suffix length due to possibly glued databases
+	get_suffix | awk '{ print length, $0 }' | sort -n | cut -d ' ' -f 2- \
+	| while read suffix; do
 		dbdir=`get_directory "$suffix"`
 		if [ -z "$dbdir" ]; then
 			continue

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