Merge pull request #5024 from matrix-org/rav/record_correct_server_in_serverkeys

Fix from_server buglet in get_keys_from_perspectives

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,