mirror of
https://mau.dev/maunium/synapse.git
synced 2024-08-25 11:45:30 +00:00
Merge pull request #1007 from sargon/develop
Fix some bugs in the auth/ldap handler
This commit is contained in:
commit
2edb7c7676
@ -70,11 +70,11 @@ class AuthHandler(BaseHandler):
|
|||||||
self.ldap_uri = hs.config.ldap_uri
|
self.ldap_uri = hs.config.ldap_uri
|
||||||
self.ldap_start_tls = hs.config.ldap_start_tls
|
self.ldap_start_tls = hs.config.ldap_start_tls
|
||||||
self.ldap_base = hs.config.ldap_base
|
self.ldap_base = hs.config.ldap_base
|
||||||
self.ldap_filter = hs.config.ldap_filter
|
|
||||||
self.ldap_attributes = hs.config.ldap_attributes
|
self.ldap_attributes = hs.config.ldap_attributes
|
||||||
if self.ldap_mode == LDAPMode.SEARCH:
|
if self.ldap_mode == LDAPMode.SEARCH:
|
||||||
self.ldap_bind_dn = hs.config.ldap_bind_dn
|
self.ldap_bind_dn = hs.config.ldap_bind_dn
|
||||||
self.ldap_bind_password = hs.config.ldap_bind_password
|
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.hs = hs # FIXME better possibility to access registrationHandler later?
|
||||||
self.device_handler = hs.get_device_handler()
|
self.device_handler = hs.get_device_handler()
|
||||||
@ -660,7 +660,7 @@ class AuthHandler(BaseHandler):
|
|||||||
else:
|
else:
|
||||||
logger.warn(
|
logger.warn(
|
||||||
"ldap registration failed: unexpected (%d!=1) amount of results",
|
"ldap registration failed: unexpected (%d!=1) amount of results",
|
||||||
len(result)
|
len(conn.response)
|
||||||
)
|
)
|
||||||
defer.returnValue(False)
|
defer.returnValue(False)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user