Merge branch 'release-v0.25.1'

2017-11-17 12:03:07 +00:00 · 2017-11-17 12:03:07 +00:00 · b102e93571
parent b26cbbb60e 74bbeb4373
commit b102e93571
3 changed files with 10 additions and 2 deletions
--- a/CHANGES.rst
+++ b/CHANGES.rst
@ -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)
 =======================================

--- a/synapse/init.py
+++ b/synapse/init.py
@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """

-__version__ = "0.25.0"
+__version__ = "0.25.1"
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@ -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")):