summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorManuel Stahl <37705355+awesome-manuel@users.noreply.github.com>2020-01-09 14:31:00 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-01-09 13:31:00 +0000
commitd2906fe6667d3384f37ef03ca87172d643d49587 (patch)
tree3faae532d8f4a6c0de86c6cdf8c0a5ac3086680e /synapse/storage
parentMerge branch 'master' into develop (diff)
downloadsynapse-d2906fe6667d3384f37ef03ca87172d643d49587.tar.xz
Allow admin users to create or modify users without a shared secret (#6495)
Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/data_stores/main/registration.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/data_stores/main/registration.py b/synapse/storage/data_stores/main/registration.py

index 5e8ecac0ea..cb4b2b39a0 100644 --- a/synapse/storage/data_stores/main/registration.py +++ b/synapse/storage/data_stores/main/registration.py
@@ -52,11 +52,13 @@ class RegistrationWorkerStore(SQLBaseStore): "name", "password_hash", "is_guest", + "admin", "consent_version", "consent_server_notice_sent", "appservice_id", "creation_ts", "user_type", + "deactivated", ], allow_none=True, desc="get_user_by_id",