summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-12-19 13:44:23 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2014-12-19 13:44:23 +0100
commitf5b29afd3f353d3d0e312cdb7584417dbddb088b (patch)
treeadfd56bd8ff754e861a94cf50751fc12700ea15c
parent0ba52ce2a4fbd3112d61547a7933a74e4837d492 (diff)
parentd5c5678fb346696dd5293bc8669accb057363a17 (diff)
downloadpykolab-f5b29afd3f353d3d0e312cdb7584417dbddb088b.tar.gz
Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab
-rw-r--r--pykolab/auth/ldap/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index e6f43b3..33f3f8e 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -2168,6 +2168,10 @@ class LDAP(pykolab.base.Base):
return _domain_attrs[domain_rootdn_attribute]
else:
+ domain_name_attribute = self.config_get('domain_name_attribute')
+ if domain_name_attribute == None:
+ domain_name_attribute = 'associateddomain'
+
if isinstance(_domain_attrs[domain_name_attribute], list):
domain = _domain_attrs[domain_name_attribute][0]
else: