diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-04-08 15:40:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 15:40:37 +0100 |
| commit | 67d7b4478404138c823e0b55d628b791dec1964f (patch) | |
| tree | 30c7df1cb548f30917a53d09ee060c9556fd5f6c /synapse/crypto/keyring.py | |
| parent | drop tables listed in #1830 (#4992) (diff) | |
| parent | Fix from_server buglet in get_keys_from_perspectives (diff) | |
| download | synapse-67d7b4478404138c823e0b55d628b791dec1964f.tar.xz | |
Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys
Fix from_server buglet in get_keys_from_perspectives
Diffstat (limited to 'synapse/crypto/keyring.py')
| -rw-r--r-- | synapse/crypto/keyring.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/crypto/keyring.py b/synapse/crypto/keyring.py index 54af60d711..04beededdc 100644 --- a/synapse/crypto/keyring.py +++ b/synapse/crypto/keyring.py @@ -652,7 +652,7 @@ class Keyring(object): self.store.store_server_keys_json, server_name=server_name, key_id=key_id, - from_server=server_name, + from_server=from_server, ts_now_ms=time_now_ms, ts_expires_ms=ts_valid_until_ms, key_json_bytes=signed_key_json_bytes, |