diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:28:36 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:28:36 +0100 |
| commit | ce2a7ed6e435cba44df386e718cdccecc119d333 (patch) | |
| tree | aa73f75d9ba9c70fdbb18ecf6d9237889f154933 /synapse/handlers/auth.py | |
| parent | Merge branch 'develop' into auth (diff) | |
| parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-ce2a7ed6e435cba44df386e718cdccecc119d333.tar.xz | |
Merge branch 'develop' into auth
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 be2baeaece..ff2c66f442 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -162,7 +162,7 @@ class AuthHandler(BaseHandler): if not user_id.startswith('@'): user_id = UserID.create(user_id, self.hs.hostname).to_string() - self._check_password(user_id, password) + yield self._check_password(user_id, password) defer.returnValue(user_id) @defer.inlineCallbacks |