2 commits - pykolab/auth pykolab/Makefile.am
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Thu Sep 13 17:33:27 CEST 2012
pykolab/Makefile.am | 3 ++-
pykolab/auth/__init__.py | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit b66c633e71ab5ce106f885565eb1d7f798f1b4e8
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Sep 13 14:08:03 2012 +0100
Include syncrepl module with pykolab
diff --git a/pykolab/Makefile.am b/pykolab/Makefile.am
index 6353f86..1a2f2a1 100644
--- a/pykolab/Makefile.am
+++ b/pykolab/Makefile.am
@@ -8,7 +8,8 @@ pykolab_auth_PYTHON = \
pykolab_auth_ldapdir = $(pythondir)/$(PACKAGE)/auth/ldap
pykolab_auth_ldap_PYTHON = \
auth/ldap/__init__.py \
- auth/ldap/cache.py
+ auth/ldap/cache.py \
+ auth/ldap/syncrepl.py
pykolab_clidir = $(pythondir)/$(PACKAGE)/cli
pykolab_cli_PYTHON = \
commit a4e94aacc3668ac4543be60f0070181ad55fa803
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Sep 13 14:04:07 2012 +0100
Only actually fail listing domains if the primary domain is the domain auth has been instantiated for (#1004)
diff --git a/pykolab/auth/__init__.py b/pykolab/auth/__init__.py
index b8e0d3b..359a0f6 100644
--- a/pykolab/auth/__init__.py
+++ b/pykolab/auth/__init__.py
@@ -223,7 +223,11 @@ class Auth(pykolab.base.Base):
# Find the domains in the authentication backend.
kolab_primary_domain = conf.get('kolab', 'primary_domain')
- domains = self._auth._list_domains()
+ try:
+ domains = self._auth._list_domains()
+ except:
+ if not self.domain == kolab_primary_domain:
+ return [(self.domain, [])]
# If no domains are found, the primary domain is used.
if len(domains) < 1:
More information about the commits
mailing list