Index: kolabd/kolabd/kolab_bootstrap.in
===================================================================
RCS file: /home/kroupware/jail/kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.26
diff -r1.26 kolab_bootstrap.in
845a846,854
>   print << 'EOS';
> Now the master server needs to be stopped briefly while the contents of the LDAP database
> is copied over to this slave. Please make sure that this slave is entered into the list 
> of kolabhosts on the master before proceeding.
> EOS
>   kolab_system("ssh -CA $master_host /kolab/bin/openpkg rc openldap stop");
>   kolab_system("ssh -CA $master_host /kolab/lib/openpkg/tar -C /kolab/var/openldap -pcf - openldap-data | /kolab/lib/openpkg/tar -C /kolab/var/openldap -pxf -");
>   kolab_system("ssh -CA $master_host /kolab/bin/openpkg rc openldap start");
> 
Index: kolabd/kolabd/templates/slapd.conf.template.in
===================================================================
RCS file: /home/kroupware/jail/kolabrepository/server/kolabd/kolabd/templates/slapd.conf.template.in,v
retrieving revision 1.12
diff -r1.12 slapd.conf.template.in
64a65,80
> #### Provide the modern syncprov/syncrepl method of ldap replication
> # This database is a synchronisation provider
> # Note that a database can be both a consumer and a provider 
> overlay syncprov
> # Guarantee that contextCSN gets written.
> syncprov-checkpoint  1024 16
> # Save a log of last write operations
> syncprov-sessionlog 4096
> # Support delta-based syncrepl
> syncprov-reloadhint TRUE
> # Put an index on attributes used for synchronisation
> # Note that these indexes are used locally both for server and client 
> # during synchronisation.
> index entryCSN eq
> index entryUUID eq
> 
Index: perl-kolab/Kolab-Conf/Conf.pm.in
===================================================================
RCS file: /home/kroupware/jail/kolabrepository/server/perl-kolab/Kolab-Conf/Conf.pm.in,v
retrieving revision 1.10
diff -r1.10 Conf.pm.in
693,704c693,694
<       my @kh;
<       if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
< 	@kh = @{$Kolab::config{'kolabhost'}};
<       } else {
< 	@kh = ( $Kolab::config{'kolabhost'} );
<       }
<       for my $h ( @kh ) {
< 	next if lc($h) eq lc($Kolab::config{'fqdnhostname'});
< 	print $repl "replica uri=ldaps://$h\n"
< 	  ."  binddn=\"".$Kolab::config{'bind_dn'}."\"\n"
< 	    ."  bindmethod=simple credentials=".$Kolab::config{'bind_pw'}."\n\n";
<       }
---
>       # The master is already configured to be synchronisation provider in slapd.conf
>       # Note that both masters and slaves are synchronisation providers.
707,708c697,706
<       # Output an update dn statement instead
<       print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
---
>       # Output a syncrepl statement for database synchronisation
>       print $repl "syncrepl rid=0 \n"
>                  ."         provider=".$Kolab::config{"ldap_master_uri"}."\n"
>                  ."         type=refreshAndPersist\n"
>                  ."         searchbase=\"".$Kolab::config{'base_dn'}."\"\n"
>                  ."         scope=sub\n"
>                  ."         schemachecking=on\n"
>                  ."         binddn=\"".$Kolab::config{"bind_dn"}."\"\n"
>                  ."         credentials=\"".$Kolab::config{"bind_pw"}."\"\n"
>                  ."         bindmethod=simple\n";