From a080ec6caa3f0075412cbb25b54277cd66f9a3a0 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 25 Jun 2020 15:04:31 +0100
Subject: [PATCH] Update whitelist, pass network errors through in API=1 mode

---
 federationsender/internal/perform.go | 2 +-
 sytest-whitelist                     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/federationsender/internal/perform.go b/federationsender/internal/perform.go
index 831622efe..96b1149d9 100644
--- a/federationsender/internal/perform.go
+++ b/federationsender/internal/perform.go
@@ -97,7 +97,7 @@ func (r *FederationSenderInternalAPI) PerformJoin(
 	} else {
 		response.LastError = &gomatrix.HTTPError{
 			Code:         0,
-			WrappedError: lastErr,
+			WrappedError: nil,
 			Message:      lastErr.Error(),
 		}
 	}
diff --git a/sytest-whitelist b/sytest-whitelist
index ea175e7ce..eb28898ab 100644
--- a/sytest-whitelist
+++ b/sytest-whitelist
@@ -371,3 +371,5 @@ Inbound federation rejects attempts to join v2 rooms from servers lacking versio
 Inbound federation rejects attempts to join v2 rooms from servers only supporting v1
 Outbound federation passes make_join failures through to the client
 Outbound federation correctly handles unsupported room versions
+Remote users may not join unfederated rooms
+Guest users denied access over federation if guest access prohibited