From 0cbb4808edaab7a0d08141a8e90deefda1230659 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 3 Apr 2020 11:28:49 +0100
Subject: Revert "Revert "Merge pull request #7153 from
 matrix-org/babolivier/sso_whitelist_login_fallback""

This reverts commit 0122ef1037c8bfe826ea09d9fc7cd63fb9c59fd1.
---
 docs/sample_config.yaml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docs')

diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 2ff0dd05a2..07e922dc27 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1392,6 +1392,10 @@ sso:
     # phishing attacks from evil.site. To avoid this, include a slash after the
     # hostname: "https://my.client/".
     #
+    # If public_baseurl is set, then the login fallback page (used by clients
+    # that don't natively support the required login flows) is whitelisted in
+    # addition to any URLs in this list.
+    #
     # By default, this list is empty.
     #
     #client_whitelist:
-- 
cgit 1.5.1