summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDirk Klimpel <5740567+dklimpel@users.noreply.github.com>2021-03-18 17:54:08 +0100
committerGitHub <noreply@github.com>2021-03-18 12:54:08 -0400
commit8dd2ea65a9566fd0850df0d989f700f61b490ed9 (patch)
tree558a61437c465c955160d45e8b8356d7ee9a5a68 /synapse/rest
parentMake federation catchup send last event from any server. (#9640) (diff)
downloadsynapse-8dd2ea65a9566fd0850df0d989f700f61b490ed9.tar.xz
Consistently check whether a password may be set for a user. (#9636)
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/admin/users.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py
index 2c89b62e25..aaa56a7024 100644
--- a/synapse/rest/admin/users.py
+++ b/synapse/rest/admin/users.py
@@ -271,7 +271,7 @@ class UserRestServletV2(RestServlet):
                 elif not deactivate and user["deactivated"]:
                     if (
                         "password" not in body
-                        and self.hs.config.password_localdb_enabled
+                        and self.auth_handler.can_change_password()
                     ):
                         raise SynapseError(
                             400, "Must provide a password to re-activate an account."