From 264e5351ef719d78c6b487483748283801db53ce Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Wed, 31 Jul 2013 20:23:21 +0100 Subject: Use a dynamic user filter --- pykolab/auth/ldap/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py index 8b2e841..4c4afc4 100644 --- a/pykolab/auth/ldap/__init__.py +++ b/pykolab/auth/ldap/__init__.py @@ -151,7 +151,15 @@ class LDAP(pykolab.base.Base): self.connect() self._bind() - user_filter = self.config_get('user_filter') + config_base_dn = self.config_get('base_dn') + ldap_base_dn = self._kolab_domain_root_dn(self.domain) + + if not ldap_base_dn == None and not ldap_base_dn == config_base_dn: + base_dn = ldap_base_dn + else: + base_dn = config_base_dn + + user_filter = self.config_get_raw('user_filter') % ({'base_dn':base_dn}) _filter = '(&(|' -- cgit v1.1