pykolab/auth

[Thomas Brüderli]

 pykolab/auth/ldap/__init__.py |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit d5c5678fb346696dd5293bc8669accb057363a17
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Dec 15 12:17:22 2014 +0100

    Fix error due to missing 'domain_name_attribute' variable

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: