summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-08 14:40:54 +0000
committerErik Johnston <erik@matrix.org>2016-11-08 14:40:54 +0000
commit291628d42a8dbd6cbf49154d6a5b35582c0e5cde (patch)
tree0fddc5139ddd2509422cba07e544a4998f19c8e7 /synapse/util
parentMerge branch 'release-v0.18.2' of github.com:matrix-org/synapse (diff)
parentBump version and changelog (diff)
downloadsynapse-0.18.3.tar.xz
Merge branch 'erikj/ldap3_auth' v0.18.3
Diffstat (limited to '')
-rw-r--r--synapse/util/ldap_auth_provider.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/util/ldap_auth_provider.py b/synapse/util/ldap_auth_provider.py

index f852e9b037..1b989248fb 100644 --- a/synapse/util/ldap_auth_provider.py +++ b/synapse/util/ldap_auth_provider.py
@@ -236,7 +236,8 @@ class LdapAuthProvider(object): value=localpart, base=self.ldap_base ) - conn = ldap3.Connection(server, bind_dn, password) + conn = ldap3.Connection(server, bind_dn, password, + authentication=ldap3.AUTH_SIMPLE) logger.debug( "Established LDAP connection in simple bind mode: %s", conn