[Pkg-openldap-devel] OpenLDAP 2.4.7

[Steve Langasek]

On Sat, Jan 12, 2008 at 01:09:54PM -0800, Russ Allbery wrote:
> > @@ -434,6 +435,7 @@
> >  		use File::Compare;
> >  		use File::Copy;
> >  
> > +		$has_replica = $seen_syncprov = 0;
> >  		$backend_bdb = $backend_hdb = 0;
> >  		$checkpoint_bdb = "";
> >  		$checkpoint_hdb = "";
> > @@ -474,6 +476,16 @@
> >  					print $fh $_ . $checkpoint_hdb;
> >  					next;
> >  				}
> > +				$seen_syncprov = 1 if /^moduleload\s+syncprov/;
> > +				if (/^replica\s+/)
> > +				{
> > +					if (!$has_replica && !$seen_syncprov) {
> > +						print $fh "moduleload syncprov\n";

> I think you need to set $seen_syncprov to 1 here; otherwise, for the case
> where there's no existing module line, I think you end up generating
> moduleload lines for each replica line.

Oops, quite right; amended.

On Sat, Jan 12, 2008 at 01:14:08PM -0800, Quanah Gibson-Mount wrote:
> --On Saturday, January 12, 2008 1:09 PM -0800 Russ Allbery <rra at debian.org> 
> wrote:

> > I hope moduleload is allowed anywhere in the configuration file, since I
> > think we mix it in with backend configuration using this method if I
> > understand the layout correctly.

> moduleload is global, and should only be found once in the slapd.conf file 
> per module prior to any database section.

Well, in practice it seems to work ok to have the 'moduleload' for syncprov
in the database section, but if you say this isn't guaranteed to be
supported, I can rework the script to prepend it to the file instead.

-- 
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