[Pkg-openldap-devel] Bug#517556: Bug#517556: upgrading slapd fails with multiple databases and dbconfig settings in slapd.conf

[Steve Langasek]

On Sun, Mar 15, 2009 at 07:41:23PM +0100, Peter Marschall wrote:

> Please find attached an update patch (unfortunately not tested), that
> tries to address both issues:
> - it ignores a DB_CONFIG in is_empty_dir
> - it tries to only restore DB_CONFIG from backup/ load default DB_CONFIG
>   if there is no DB_CONFIG in the database directory
>   This is done for all databases before the first slapadd,
>   to keep the same logic for all.

Thanks, patch applied at last to subversion!  FWIW, I made one tweak to the
is_empty_dir implementation, namely that I've dropped the check for
non-existent dirs; I think it was a bug in the earlier implementation that
is_empty_dir <nonexistent> would return false instead of true.  All the
invocations of is_empty_dir that care about existence already have their own
check, so let's simplify the is_empty_dir implementation.

Cheers,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org