diff options
| author | Daniel Ehlers <danielehlers@mindeye.net> | 2016-08-14 02:30:54 +0200 |
|---|---|---|
| committer | Daniel Ehlers <danielehlers@mindeye.net> | 2016-08-14 16:48:33 +0200 |
| commit | e380538b594d4fa55e98818df0061efbdf3cb35b (patch) | |
| tree | 82f75c98188ddaf4a6ace2d6f22e5039ce7c05ba /synapse/handlers | |
| parent | Only process one local membership event per room at a time (diff) | |
| download | synapse-e380538b594d4fa55e98818df0061efbdf3cb35b.tar.xz | |
Fix AttributeError when bind_dn is not defined.
In case one does not define bind_dn in ldap configuration, filter attribute is not declared. Since auth code only uses ldap_filter attribute when according LDAP mode is selected, it is safe to only declare the attribute in that case. Signed-off-by: Daniel Ehlers <sargon@toppoint.de>
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/auth.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 82998a81ce..c9307bd440 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() |