diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:17:47 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:17:47 +0000 |
commit | 84b78c3b5fe3f5e82c3fdf1a2a1c7eed62e1b887 (patch) | |
tree | 0475ae5759bd17bc76780a7f376e8a7bd900a430 /synapse/handlers/register.py | |
parent | Split up replication_layer module into client, server and transaction queue (diff) | |
parent | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... (diff) | |
download | synapse-84b78c3b5fe3f5e82c3fdf1a2a1c7eed62e1b887.tar.xz |
Merge branch 'rejections_storage' of github.com:matrix-org/synapse into replication_split
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r-- | synapse/handlers/register.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 732652c228..66a89c10b2 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -163,7 +163,7 @@ class RegistrationHandler(BaseHandler): # each request httpCli = SimpleHttpClient(self.hs) # XXX: make this configurable! - trustedIdServers = ['matrix.org:8090'] + trustedIdServers = ['matrix.org:8090', 'matrix.org'] if not creds['idServer'] in trustedIdServers: logger.warn('%s is not a trusted ID server: rejecting 3pid ' + 'credentials', creds['idServer']) |