From 1ea3a19403b01eb1658f425063d98e5ee727f973 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Fri, 5 Aug 2022 18:33:41 +0200
Subject: [PATCH] downstream: refuse to enable multi-upstream mode

References: https://todo.sr.ht/~emersion/soju/125
---
 downstream.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/downstream.go b/downstream.go
index f66e069..5c5c0d0 100644
--- a/downstream.go
+++ b/downstream.go
@@ -1411,14 +1411,10 @@ func (dc *downstreamConn) loadNetwork(ctx context.Context) error {
 	}
 
 	if dc.registration.networkName == "*" {
-		if !dc.srv.Config().MultiUpstream {
-			return ircError{&irc.Message{
-				Command: irc.ERR_PASSWDMISMATCH,
-				Params:  []string{dc.nick, fmt.Sprintf("Multi-upstream mode is disabled on this server")},
-			}}
-		}
-		dc.isMultiUpstream = true
-		return nil
+		return ircError{&irc.Message{
+			Command: irc.ERR_PASSWDMISMATCH,
+			Params:  []string{dc.nick, fmt.Sprintf("Multi-upstream mode is no longer supported")},
+		}}
 	}
 
 	if dc.registration.networkName == "" {