[checkmk-commits] #2689 FIX LDAP: Fixed broken sync when using "Filter Group" in the user sync settings

Module: check_mk Branch: master Commit: d9bc5273e4181635bfc086ddb0dcb7c7c618b972 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9bc5273e41816… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 23 11:37:37 2015 +0200 #2689 FIX LDAP: Fixed broken sync when using "Filter Group" in the user sync settings --- .werks/2689 | 10 ++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2689 b/.werks/2689 new file mode 100644 index 0000000..4f9dc2b --- /dev/null +++ b/.werks/2689 @@ -0,0 +1,10 @@ +Title: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445593025 + + diff --git a/ChangeLog b/ChangeLog index c3a9ad3..aab48fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ * 2685 FIX: LDAP: Fixed failing synchronization when migrating some old configs... * 2686 FIX: Fixed showing graphs for cluster ping services * 2687 FIX: Quicksearch: Improved error handling + * 2689 FIX: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 90b7012..f596c27 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -621,7 +621,7 @@ class LDAPUserConnector(UserConnector): # Apply configured group ldap filter try: - group = self.ldap_search(self.replace_macros(filter_group_dn), [member_attr], 'base') + group = self.ldap_search(self.replace_macros(filter_group_dn), columns=[member_attr], scope='base') except MKLDAPException: group = None