Module: check_mk
Branch: master
Commit: 4f9b54c2c5273314de1d16e46299d3be561788ac
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f9b54c2c52733…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jan 15 08:49:56 2014 +0100
FIX LDAP: Fixed group syncrhonisation when nested group sync is enabled
---
.werks/431 | 9 +++++++++
ChangeLog | 1 +
web/plugins/userdb/ldap.py | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/431 b/.werks/431
new file mode 100644
index 0000000..8a8db8e
--- /dev/null
+++ b/.werks/431
@@ -0,0 +1,9 @@
+Title: LDAP: Fixed group syncrhonisation when nested group sync is enabled
+Level: 2
+Component: multisite
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1389772171
+
+
diff --git a/ChangeLog b/ChangeLog
index 008478e..719b639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,6 +135,7 @@
* 0424 FIX: Improved error handling in case of incorrect auth config in distributed
WATO environments
* 0425 FIX: Fix login loop bug in distributed environments with different auth
secrets
* 0117 FIX: Availability button is now visible for users without the right to edit
views
+ * 0431 FIX: LDAP: Fixed group syncrhonisation when nested group sync is enabled
WATO:
* 0308 Multisite can now set rotation view permissions for NagVis...
diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py
index 27a6a64..3ba05d5 100644
--- a/web/plugins/userdb/ldap.py
+++ b/web/plugins/userdb/ldap.py
@@ -622,7 +622,7 @@ def ldap_group_members(filters, filt_attr = 'cn', nested =
False):
'cn' : cn,
}
for user_dn, obj in
ldap_search(ldap_replace_macros(config.ldap_userspec['dn']), filt, columns =
['dn']):
- groups[dn]['members'].append(user_dn.lower)
+ groups[dn]['members'].append(user_dn.lower())
g_ldap_group_cache[cache_key] = groups
return groups