[Pkg-openldap-devel] OpenLDAP 2.4.7

[Russ Allbery]

Steve Langasek <vorlon at debian.org> writes:

> Updated patch attached; does this look good to commit?

One more change; other than that, looks good to me.

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

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.

-- 
Russ Allbery (rra at debian.org)               <http://www.eyrie.org/~eagle/>