From ce1c975ebc3f2ba6448ec97dcc94ff7f4da8d4c4 Mon Sep 17 00:00:00 2001
From: Syam G Krishnan <syamgk01@gmail.com>
Date: Fri, 29 Nov 2019 22:50:13 +0530
Subject: [PATCH 1/2] Issue #6406 Fix parameter mismatch

Signed-off-by: Syam G Krishnan <syamgk01@gmail.com>
---
 synapse/handlers/register.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 95806af41..8a7d965fe 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -266,7 +266,7 @@ class RegistrationHandler(BaseHandler):
             }
 
             # Bind email to new account
-            yield self._register_email_threepid(user_id, threepid_dict, None, False)
+            yield self._register_email_threepid(user_id, threepid_dict, None)
 
         return user_id
 

From b62c9db8d77d76a962300aa740d2e61d57dc6888 Mon Sep 17 00:00:00 2001
From: Syam G Krishnan <syamgk01@gmail.com>
Date: Fri, 29 Nov 2019 23:06:44 +0530
Subject: [PATCH 2/2] Add changelog file

Signed-off-by: Syam G Krishnan <syamgk@gmail.com>
---
 changelog.d/6406.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6406.bugfix

diff --git a/changelog.d/6406.bugfix b/changelog.d/6406.bugfix
new file mode 100644
index 000000000..ca9bee084
--- /dev/null
+++ b/changelog.d/6406.bugfix
@@ -0,0 +1 @@
+Fix bug: TypeError in `register_user()` while using LDAP auth module.