diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 10:03:24 +0000 |
| commit | 9978c5c10310512493b976f482f400bf30a78729 (patch) | |
| tree | 5afafbfa518af855eb654a4a060f692b0ae2332e /synapse/handlers/federation.py | |
| parent | Merge branch 'develop' into application-services (diff) | |
| parent | Merge pull request #60 from matrix-org/single_source_version_and_dependencies (diff) | |
| download | synapse-9978c5c10310512493b976f482f400bf30a78729.tar.xz | |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/handlers/federation.py')
| -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 |