summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-08-03 09:48:31 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-08-03 09:48:31 (GMT)
commit612c27d2dfd422790ca3f246951b40ce57d3b530 (patch)
treee5f1eea7788b3ed1036fbd8064c941a00c8fff21
parentfad96044eba850d871d34987317bd4e1d34e300f (diff)
downloadpykolab-612c27d2dfd422790ca3f246951b40ce57d3b530.tar.gz
A standard root dn is the ,dc= version of the parent root domain, and not (potentially) an alias
-rw-r--r--pykolab/auth/ldap/__init__.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index ba9f017..22c3dfa 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -1927,6 +1927,9 @@ class LDAP(pykolab.base.Base):
_domain_attrs = utils.normalize(_domain_attrs)
if _domain_attrs.has_key(domain_rootdn_attribute):
return _domain_attrs[domain_rootdn_attribute]
+ else:
+ if isinstance(_domain_attrs[domain_name_attribute], list):
+ domain = _domain_attrs[domain_name_attribute][0]
else:
if conf.has_option('ldap', 'base_dn'):