[pkg-kolab] r931 - in kolabconf/trunk/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-07-22 21:18:52 +0000 (Tue, 22 Jul 2008)
New Revision: 931

Modified:
   kolabconf/trunk/debian/changelog
   kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch
Log:
Updated 85-slapd-syncrepl-24.dpatch to match current upstream proposed patch



Modified: kolabconf/trunk/debian/changelog
===================================================================
--- kolabconf/trunk/debian/changelog	2008-07-22 21:18:11 UTC (rev 930)
+++ kolabconf/trunk/debian/changelog	2008-07-22 21:18:52 UTC (rev 931)
@@ -1,3 +1,10 @@
+kolabconf (2.2.0-2) unstable; urgency=low
+
+  * Updated 85-slapd-syncrepl-24.dpatch to match current upstream proposed
+    patch
+
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 22 Jul 2008 22:31:52 +0200
+
 kolabconf (2.2.0-1) unstable; urgency=low
 
   * New upstream version: 2.2.0

Modified: kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch
===================================================================
--- kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch	2008-07-22 21:18:11 UTC (rev 930)
+++ kolabconf/trunk/debian/patches/85-slapd-syncrepl-24.dpatch	2008-07-22 21:18:52 UTC (rev 931)
@@ -8,10 +8,12 @@
 diff -urNad kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm
 --- kolabconf-2.2~rc1+20080204~/lib/Kolab/Conf.pm	2007-10-18 11:22:52.000000000 +0200
 +++ kolabconf-2.2~rc1+20080204/lib/Kolab/Conf.pm	2008-02-17 19:15:04.000000000 +0100
-@@ -526,23 +526,22 @@
+@@ -524,25 +524,44 @@
+         exit(1);
+     }
  
-     if( $Kolab::config{'is_master'} eq "true" ) {
- 	# Master setup
+-    if( $Kolab::config{'is_master'} eq "true" ) {
+-	# Master setup
 -	my @kh;
 -	if( ref $Kolab::config{'kolabhost'} eq 'ARRAY' ) {
 -	    @kh = @{$Kolab::config{'kolabhost'}};
@@ -24,13 +26,10 @@
 -		."  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.
-     } else {
- 	# Slave setup
- 	# Output an update dn statement instead
--	print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
--	print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
++    # directory_mode syncrepl is supported from openldap-2.3.x and beyond
++    if ($Kolab::config{'directory_mode'} eq "syncrepl" or $Kolab::config{'directory_mode'} eq "sync") {
++
++      if ( $Kolab::config{'is_master'} eq "false" ) {
 +        # Output a syncrepl statement for database synchronisation
 +        print $repl "syncrepl rid=0 \n"
 +                 ."         provider=".$Kolab::config{"ldap_master_uri"}."\n"
@@ -41,7 +40,35 @@
 +                 ."         binddn=\"".$Kolab::config{"bind_dn"}."\"\n"
 +                 ."         credentials=\"".$Kolab::config{"bind_pw"}."\"\n"
 +                 ."         bindmethod=simple\n";
++      }
 +
+     } else {
+-	# Slave setup
+-	# Output an update dn statement instead
+-	print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
+-	print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
++
++      if( $Kolab::config{'is_master'} eq "true" ) {
++  	# Master setup
++  	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";
++  	}
++      } else {
++  	# Slave setup
++  	# Output an update dn statement instead
++  	print $repl "updatedn ".$Kolab::config{'bind_dn'}."\n";
++  	print $repl "updateref ".$Kolab::config{'ldap_master_uri'}."\n";
++      }
      }
  
      $repl->close;
+