summaryrefslogtreecommitdiff
path: root/pykolab
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-04 13:04:00 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-05-04 13:04:00 (GMT)
commitfff443ef7205c03ee51747414b1ca6f686e212a0 (patch)
treec6c1b15de879f96b02df45801d4278767b056ec3 /pykolab
parent45c5bea87be934124f92a08333541e0c80e8fd04 (diff)
downloadpykolab-fff443ef7205c03ee51747414b1ca6f686e212a0.tar.gz
Make sure a default mailserver_attribute is set
Diffstat (limited to 'pykolab')
-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 4ad9d5b..98acb0c 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -714,6 +714,9 @@ class LDAP(pykolab.base.Base):
An entry of type user was added.
"""
mailserver_attribute = self.config_get('mailserver_attribute')
+ if mailserver_attribute == None:
+ mailserver_attribute = 'mailhost'
+
result_attribute = conf.get('cyrus-sasl', 'result_attribute')
if not entry.has_key(mailserver_attribute):