From a7bcbfccf3bb3fc7808ea625075e066f0783b1c8 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Fri, 2 Aug 2013 11:53:15 +0100 Subject: Use the base_dn obtained unless the proper routine finds different --- pykolab/auth/ldap/__init__.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py index 4c4afc4..ba9f017 100644 --- a/pykolab/auth/ldap/__init__.py +++ b/pykolab/auth/ldap/__init__.py @@ -831,8 +831,16 @@ class LDAP(pykolab.base.Base): _filter = "(%s=%s)" % (attr, value) + 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 + return self._search( - self.config_get('base_dn'), + base_dn, filterstr=_filter, attrlist=[ '*', @@ -1794,7 +1802,13 @@ class LDAP(pykolab.base.Base): entry_dn = self.entry_dn(entry_id) - base_dn = self.config_get('base_dn') + 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 for _type in ['user', 'group', 'sharedfolder']: __filter = self.config_get('kolab_%s_filter' % (_type)) -- cgit v1.1