diff options
| author | Erik Johnston <erikj@jki.re> | 2016-08-14 16:07:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-14 16:07:31 +0100 |
| commit | 2edb7c76766000647c104c21c8ee0e8279152fd4 (patch) | |
| tree | a3f8e67d29739338e1d83acfec9ee759384bb522 /synapse/handlers | |
| parent | Merge pull request #1005 from matrix-org/erikj/linearize_joins (diff) | |
| parent | Log the value which is observed in the first place. (diff) | |
| download | synapse-2edb7c76766000647c104c21c8ee0e8279152fd4.tar.xz | |
Merge pull request #1007 from sargon/develop
Fix some bugs in the auth/ldap handler
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/auth.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 82998a81ce..a582d6334b 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -70,11 +70,11 @@ class AuthHandler(BaseHandler): self.ldap_uri = hs.config.ldap_uri self.ldap_start_tls = hs.config.ldap_start_tls self.ldap_base = hs.config.ldap_base - self.ldap_filter = hs.config.ldap_filter self.ldap_attributes = hs.config.ldap_attributes if self.ldap_mode == LDAPMode.SEARCH: self.ldap_bind_dn = hs.config.ldap_bind_dn self.ldap_bind_password = hs.config.ldap_bind_password + self.ldap_filter = hs.config.ldap_filter self.hs = hs # FIXME better possibility to access registrationHandler later? self.device_handler = hs.get_device_handler() @@ -660,7 +660,7 @@ class AuthHandler(BaseHandler): else: logger.warn( "ldap registration failed: unexpected (%d!=1) amount of results", - len(result) + len(conn.response) ) defer.returnValue(False) |