diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-08 14:40:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-08 14:40:54 +0000 |
| commit | 291628d42a8dbd6cbf49154d6a5b35582c0e5cde (patch) | |
| tree | 0fddc5139ddd2509422cba07e544a4998f19c8e7 /synapse | |
| parent | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-291628d42a8dbd6cbf49154d6a5b35582c0e5cde.tar.xz | |
Merge branch 'erikj/ldap3_auth' v0.18.3
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/util/ldap_auth_provider.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 4e2a592d3d..d366b69dab 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.18.2" +__version__ = "0.18.3" 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 |