summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-03-16 15:36:52 +0000
committerErik Johnston <erik@matrix.org>2015-03-16 15:36:52 +0000
commitcd2539ab2a1ed1fd47b56a6b0bdf4fd8dd48430d (patch)
treee67454bd79cac6eee86815e61996ddd2102b1b50 /synapse/handlers/federation.py
parentMerge pull request #111 from matrix-org/send_event_dont_wait_on_notifier (diff)
parentFix tests (diff)
downloadsynapse-cd2539ab2a1ed1fd47b56a6b0bdf4fd8dd48430d.tar.xz
Merge pull request #110 from matrix-org/fix_ban
Fix ban
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index ae4e9b316d..65cfacba2e 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -464,11 +464,9 @@ class FederationHandler(BaseHandler):
             builder=builder,
         )
 
-        self.auth.check(event, auth_events=context.auth_events)
+        self.auth.check(event, auth_events=context.current_state)
 
-        pdu = event
-
-        defer.returnValue(pdu)
+        defer.returnValue(event)
 
     @defer.inlineCallbacks
     @log_function
@@ -705,7 +703,7 @@ class FederationHandler(BaseHandler):
         )
 
         if not auth_events:
-            auth_events = context.auth_events
+            auth_events = context.current_state
 
         logger.debug(
             "_handle_new_event: %s, auth_events: %s",