Merge branch 'release-v0.25.1'

pull/2694/merge
Richard van der Hoff 2017-11-17 12:03:07 +00:00
commit b102e93571
3 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,11 @@
Changes in synapse v0.25.1 (2017-11-17)
=======================================
Bug fixes:
* Fix login with LDAP and other password provider modules (PR #2678). Thanks to
@jkolo!
Changes in synapse v0.25.0 (2017-11-15)
=======================================

View File

@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server.
"""
__version__ = "0.25.0"
__version__ = "0.25.1"

View File

@ -551,7 +551,7 @@ class AuthHandler(BaseHandler):
qualified_user_id, password,
)
if is_valid:
defer.returnValue(qualified_user_id)
defer.returnValue((qualified_user_id, None))
if (not hasattr(provider, "get_supported_login_types")
or not hasattr(provider, "check_auth")):