summaryrefslogtreecommitdiffstats
path: root/pykolab/base.py
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-05-23 15:37:07 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-05-23 15:37:07 +0200
commitc915487867d227617f8ae7d996af51e5470ff54e (patch)
treec3048fd1db9f4d6704230272e2e71c372ac8ce1c /pykolab/base.py
parentcdf8599b29826b815bc14f7a4c6b07c628678366 (diff)
downloadpykolab-c915487867d227617f8ae7d996af51e5470ff54e.tar.gz
Make sure that in a multi-domain environment, we get the base dn for additional domain name spaces right.
Diffstat (limited to 'pykolab/base.py')
-rw-r--r--pykolab/base.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pykolab/base.py b/pykolab/base.py
index b63ca2d..207783c 100644
--- a/pykolab/base.py
+++ b/pykolab/base.py
@@ -26,7 +26,10 @@ class Base(object):
Abstraction class for functions commonly shared between auth, imap, etc.
"""
def __init__(self, *args, **kw):
- self.domain = conf.get('kolab', 'primary_domain')
+ if kw.has_key('domain') and not kw['domain'] == None:
+ self.domain = kw['domain']
+ else:
+ self.domain = conf.get('kolab', 'primary_domain')
# Placeholder primary_domain => [secondary_domains]. Should be updated
# on auth backend _connect().