OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix includes

pull/136/head
David Baker 2015-04-29 15:45:44 +01:00
parent b7788f80a3
commit 109c8aafd2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
synapse/handlers/identity.py
View File

@ -22,6 +22,7 @@ from synapse.api.errors import (
from ._base import BaseHandler from ._base import BaseHandler
from synapse.http.client import SimpleHttpClient from synapse.http.client import SimpleHttpClient
from synapse.util.async import run_on_reactor from synapse.util.async import run_on_reactor
from synapse.api.errors import SynapseError
import json import json
import logging import logging
@ -59,7 +60,7 @@ class IdentityHandler(BaseHandler):
else: else:
raise SynapseError(400, "No client_secret in creds") raise SynapseError(400, "No client_secret in creds")
if not id_server in trustedIdServers: if id_server not in trustedIdServers:
logger.warn('%s is not a trusted ID server: rejecting 3pid ' + logger.warn('%s is not a trusted ID server: rejecting 3pid ' +
'credentials', id_server) 'credentials', id_server)
defer.returnValue(None) defer.returnValue(None)