kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3074f3e..081a8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-16  Sascha Wilde  <wilde@intevation.de>
+
+	* lib/Kolab/LDAP.pm (deleteObject): kolab/issue3940 (Deleting
+	users does not work if master Kolab server is not master LDAP
+	(rt5889))
+
 2009-12-14  Gunnar Wrobel <wrobel@pardus.de>
 
 	* bin/kolabpasswd.in: kolab/issue919 (kolab server has problems
diff --git a/lib/Kolab/LDAP.pm b/lib/Kolab/LDAP.pm
index 3fe9acf..6c3a063 100644
--- a/lib/Kolab/LDAP.pm
+++ b/lib/Kolab/LDAP.pm
@@ -633,8 +633,8 @@ sub deleteObject
         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;