summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-10-13 14:23:48 +0100
committerErik Johnston <erik@matrix.org>2016-10-14 10:22:43 +0100
commit6f7540ada44b26d6eced6788650a08df672d0610 (patch)
tree37fbc9d465a630ec2ac244d8860b35bbfcbd697d /synapse/api
parentFix email push notifs being dropped (diff)
parentMerge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete (diff)
downloadsynapse-6f7540ada44b26d6eced6788650a08df672d0610.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/auth.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 27599124d2..1b3b55d517 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -1001,16 +1001,6 @@ class Auth(object):
                         403,
                         "You are not allowed to set others state"
                     )
-                else:
-                    sender_domain = UserID.from_string(
-                        event.user_id
-                    ).domain
-
-                    if sender_domain != event.state_key:
-                        raise AuthError(
-                            403,
-                            "You are not allowed to set others state"
-                        )
 
         return True