summary refs log tree commit diff
path: root/synapse/rest/client/v1/room.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-06-24 16:42:21 +0100
committerGitHub <noreply@github.com>2019-06-24 16:42:21 +0100
commitfbc5b58d21a595785950e5d9e9be35722757ee17 (patch)
tree577d680284b7aa66ba6b8593bb062fc6c9df682f /synapse/rest/client/v1/room.py
parentMerge pull request #5495 from matrix-org/babolivier/deactivate_bg_job_typo (diff)
parentSplit public rooms directory auth config in two (diff)
downloadsynapse-fbc5b58d21a595785950e5d9e9be35722757ee17.tar.xz
Merge pull request #5542 from matrix-org/babolivier/federation-publicrooms dinsic_2019-06-24
Port "Split public rooms directory auth config in two" to dinsic
Diffstat (limited to 'synapse/rest/client/v1/room.py')
-rw-r--r--synapse/rest/client/v1/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 3f73ccd6bc..151b553730 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -320,7 +320,7 @@ class PublicRoomListRestServlet(TransactionRestServlet): # Option to allow servers to require auth when accessing # /publicRooms via CS API. This is especially helpful in private # federations. - if self.hs.config.restrict_public_rooms_to_local_users: + if not self.hs.config.allow_public_rooms_without_auth: raise # We allow people to not be authed if they're just looking at our