diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-04 16:30:15 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-04 16:30:15 +0000 |
commit | d45e2302ed831fe517aaf5641e736630408c8a8e (patch) | |
tree | ba5461808618f848b94d15a67a42f330a45387e3 /synapse/handlers/federation.py | |
parent | Apply sanity to the transport client interface. Convert 'make_join' and 'send... (diff) | |
parent | Change context.auth_events to what the auth_events would be bases on context.... (diff) | |
download | synapse-d45e2302ed831fe517aaf5641e736630408c8a8e.tar.xz |
Merge branch 'signature_failures' of github.com:matrix-org/synapse into federation_client_retries
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index a968a87360..04a4689483 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -842,7 +842,9 @@ class FederationHandler(BaseHandler): logger.debug("Different auth: %s", different_auth) # 1. Get what we think is the auth chain. - auth_ids = self.auth.compute_auth_events(event, context) + auth_ids = self.auth.compute_auth_events( + event, context.current_state + ) local_auth_chain = yield self.store.get_auth_chain(auth_ids) try: |