From 2f5394a0f1a55a7d3ec7fa2494cc7eedea0c5899 Mon Sep 17 00:00:00 2001 From: Arthur Vuillard Date: Thu, 11 May 2017 21:26:26 +0200 Subject: [PATCH] fix python ldap connection on python2 --- ldap-requirements.txt | 1 - modoboa/lib/ldap_utils.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ldap-requirements.txt b/ldap-requirements.txt index a74d0b79e..212b582a2 100644 --- a/ldap-requirements.txt +++ b/ldap-requirements.txt @@ -1,2 +1 @@ -pyldap django-auth-ldap diff --git a/modoboa/lib/ldap_utils.py b/modoboa/lib/ldap_utils.py index 2952f0198..b25335c17 100644 --- a/modoboa/lib/ldap_utils.py +++ b/modoboa/lib/ldap_utils.py @@ -69,7 +69,10 @@ class LDAPAuthBackend(object): def _get_conn(self, dn, password): """Get a connection from the server.""" - conn = ldap.initialize(self.server_uri, bytes_mode=False) + kwargs = {} + if six.PY3: + kwargs['bytes_mode'] = False + conn = ldap.initialize(self.server_uri, **kwargs) conn.set_option(ldap.OPT_X_TLS_DEMAND, True) conn.set_option(ldap.OPT_DEBUG_LEVEL, 255) conn.simple_bind_s(dn, password)