summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-07-12 14:51:41 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2013-07-12 14:51:41 +0100
commitf2d0080611c583d58ad1b0b454912e1397eea313 (patch)
tree73c4d302e4b47df72db51b726852d214ee32a05d
parentee0a5b4487017fbb580ce87e8e69ba2e73875896 (diff)
downloadpykolab-f2d0080611c583d58ad1b0b454912e1397eea313.tar.gz
We can't authenticate a kolab_user_filter specifically, without excluding cyrus-admin
-rw-r--r--pykolab/auth/ldap/__init__.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index e0118d1..082484a 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -151,10 +151,7 @@ class LDAP(pykolab.base.Base):
self.connect()
self._bind()
- user_filter = self.config_get('kolab_user_filter')
-
- if user_filter == None:
- user_filter = self.config_get('user_filter')
+ user_filter = self.config_get('user_filter')
_filter = '(&(|'