diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-10 10:33:35 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-10 10:33:35 +0000 |
| commit | b90d377af45a4056424e145613cf851df28d0fb7 (patch) | |
| tree | f876fb92deebbbe2324c767bfda957165a06e689 /synapse | |
| parent | Convert directory paths to absolute paths before daemonizing (diff) | |
| parent | SYN-258: get_recent_events_for_room only accepts stream tokens, convert the t... (diff) | |
| download | synapse-b90d377af45a4056424e145613cf851df28d0fb7.tar.xz | |
Merge branch 'release-v0.6.2' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/handlers/federation.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index b13b7c7701..0f9c82fd06 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -860,9 +860,14 @@ class FederationHandler(BaseHandler): # Only do auth resolution if we have something new to say. # We can't rove an auth failure. do_resolution = False + + provable = [ + RejectedReason.NOT_ANCESTOR, RejectedReason.NOT_ANCESTOR, + ] + for e_id in different_auth: if e_id in have_events: - if have_events[e_id] != RejectedReason.AUTH_ERROR: + if have_events[e_id] in provable: do_resolution = True break |