summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Wilde <wilde@intevation.de>2009-12-16 15:29:18 (GMT)
committerSascha Wilde <wilde@intevation.de>2009-12-16 15:29:18 (GMT)
commit6e642c06c8072faecf2b8094b40fb06562274967 (patch)
treee2f893f56e232e485d4c19c1bc55f0bde4ff97ab
parent7b50ae8a340fac30eebf2a2a255eae221d012a8a (diff)
downloadperl-Kolab-6e642c06c8072faecf2b8094b40fb06562274967.tar.gz
kolab/issue3940 (Deleting users does not work if master Kolab server is not master LDAP (rt5889))
-rw-r--r--ChangeLog6
-rw-r--r--lib/Kolab/LDAP.pm4
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;