diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-08 14:32:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-08 14:35:25 +0000 |
| commit | 27d3f2e7ab8e88ef61e930e0b817608863760f92 (patch) | |
| tree | 34041e45f2249d7b3f426fe61a14654896785be1 | |
| parent | Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse (diff) | |
| download | synapse-27d3f2e7ab8e88ef61e930e0b817608863760f92.tar.xz | |
Explicitly set authentication mode in ldap3
This only makes a difference for versions of ldap3 before 1.0, but a) its best to be explicit and b) there are distributions that package ancient versions for ldap3 (e.g. debian).
| -rw-r--r-- | synapse/util/ldap_auth_provider.py | 3 |
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 |