Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_user

Fix login to error for nonexistent users
pull/731/head
David Baker 2016-04-14 18:46:45 +01:00
commit a4c56bf67b
1 changed files with 1 additions and 1 deletions

View File

@ -441,7 +441,7 @@ class AuthHandler(BaseHandler):
user_id, password_hash = yield self._find_user_id_and_pwd_hash(user_id) user_id, password_hash = yield self._find_user_id_and_pwd_hash(user_id)
defer.returnValue(not self.validate_hash(password, password_hash)) defer.returnValue(not self.validate_hash(password, password_hash))
except LoginError: except LoginError:
defer.returnValue(False) defer.returnValue(True)
@defer.inlineCallbacks @defer.inlineCallbacks
def _check_ldap_password(self, user_id, password): def _check_ldap_password(self, user_id, password):