wilde: server/perl-kolab/lib/Kolab LDAP.pm,1.14,1.15

cvs at kolab.org cvs at kolab.org
Wed Dec 16 16:42:13 CET 2009


Author: wilde

Update of /kolabrepository/server/perl-kolab/lib/Kolab
In directory doto:/tmp/cvs-serv31048/perl-kolab/lib/Kolab

Modified Files:
	LDAP.pm 
Log Message:
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

Index: LDAP.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/lib/Kolab/LDAP.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- LDAP.pm	16 Apr 2009 08:55:18 -0000	1.14
+++ LDAP.pm	16 Dec 2009 15:42:11 -0000	1.15
@@ -644,8 +644,8 @@
         my $dn = $object->dn;
 	my $del = $object->get_value($Kolab::config{$p . '_field_deleted'}, asref => 1);
 	my $masterldap;
-	if( lc($Kolab::config{'is_master'}) eq 'true' ) {
-	  # We are the master, just go ahead
+	if( $Kolab::config{'ldap_master_uri'} eq $Kolab::config{'ldap_uri'} ) {
+	  # We are the LDAP master, just go ahead
 	  $masterldap = $ldap;
 	} else {
 	  $masterldap = createMasterLDAP;





More information about the commits mailing list