Skip to content
Snippets Groups Projects
Commit b102e935 authored by Richard van der Hoff's avatar Richard van der Hoff
Browse files

Merge branch 'release-v0.25.1'

parents b26cbbb6 74bbeb43
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CHANGES.rst
+ 8
− 0
View file @ b102e935
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) Changes in synapse v0.25.0 (2017-11-15)
======================================= =======================================
......
synapse/__init__.py
+ 1
− 1
View file @ b102e935
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
""" This is a reference implementation of a Matrix home server. """ This is a reference implementation of a Matrix home server.
""" """
__version__ = "0.25.0" __version__ = "0.25.1"
synapse/handlers/auth.py
+ 1
− 1
View file @ b102e935
...@@ -551,7 +551,7 @@ class AuthHandler(BaseHandler): ...@@ -551,7 +551,7 @@ class AuthHandler(BaseHandler):
qualified_user_id, password, qualified_user_id, password,
) )
if is_valid: if is_valid:
defer.returnValue(qualified_user_id) defer.returnValue((qualified_user_id, None))
if (not hasattr(provider, "get_supported_login_types") if (not hasattr(provider, "get_supported_login_types")
or not hasattr(provider, "check_auth")): or not hasattr(provider, "check_auth")):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment