diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-07-01 14:21:03 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-07-01 14:21:03 +0100 |
| commit | b4fd86a9b406dca213d5ae94df698533491936e3 (patch) | |
| tree | 6c466f5921e990a2a582efd926b1eef8204e24db /synapse/handlers/auth.py | |
| parent | Address review comments (diff) | |
| parent | Make the http server handle coroutine-making REST servlets (#5475) (diff) | |
| download | synapse-b4fd86a9b406dca213d5ae94df698533491936e3.tar.xz | |
Merge branch 'develop' into rav/saml2_client
Diffstat (limited to 'synapse/handlers/auth.py')
| -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 97b21c4093..c8c1ed3246 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -743,7 +743,7 @@ class AuthHandler(BaseHandler): result = (result, None) defer.returnValue(result) - if login_type == LoginType.PASSWORD: + if login_type == LoginType.PASSWORD and self.hs.config.password_localdb_enabled: known_login_type = True canonical_user_id = yield self._check_local_password( |