diff options
| author | Aleksander Machniak <machniak@kolabsys.com> | 2016-10-06 09:38:08 +0200 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2016-10-06 09:38:08 +0200 |
| commit | 54cb493d655bb67719572acd934994161c3751af (patch) | |
| tree | 2b8949f72414964329225154d512cab39a454cd9 | |
| parent | a3a546e1fbdda7f817b1a4e9d0700d108983780e (diff) | |
| download | pykolab-54cb493d655bb67719572acd934994161c3751af.tar.gz | |
T1414: Set LDAP TIMEOUT option only on "immediate" connection
Summary:
Fixes T1414.
Shouldn't we handle ldap.TIMEOUT exception in authenticate()?
Reviewers: #pykolab_developers, vanmeeuwen
Reviewed By: #pykolab_developers, vanmeeuwen
Subscribers: pokorra, thozie
Maniphest Tasks: T1414
Differential Revision: https://git.kolab.org/D208
| -rw-r--r-- | pykolab/auth/ldap/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py index f3a38fc..62f765a 100644 --- a/pykolab/auth/ldap/__init__.py +++ b/pykolab/auth/ldap/__init__.py @@ -404,7 +404,7 @@ class LDAP(pykolab.base.Base): return retval - def connect(self, priv=None, immediate=True): + def connect(self, priv=None, immediate=False): """ Connect to the LDAP server through the uri configured. """ @@ -441,7 +441,8 @@ class LDAP(pykolab.base.Base): retry_delay=retry_delay ) - conn.set_option(ldap.OPT_TIMEOUT, 10) + if immediate: + conn.set_option(ldap.OPT_TIMEOUT, 10) conn.protocol_version = 3 conn.supported_controls = [] |