From 2c8867bdb0ee795dabff4301f6ad94272dfb96ad Mon Sep 17 00:00:00 2001 From: contact Date: Thu, 3 Mar 2022 08:08:51 +0000 Subject: [PATCH] downstream: fix network name msimatch check being too strict The network name can be set via BOUNCER BIND. In that case we don't want to error out when fallbackNetworkName == "". git-svn-id: file:///srv/svn/repo/suika/trunk@792 f0ae65fe-ee39-954e-97ec-027ff2717ef4 --- downstream.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/downstream.go b/downstream.go index 153c3f9..c4d39f6 100644 --- a/downstream.go +++ b/downstream.go @@ -1290,7 +1290,7 @@ func (dc *downstreamConn) register(ctx context.Context) error { _, fallbackClientName, fallbackNetworkName := unmarshalUsername(dc.rawUsername) if dc.clientName == "" { dc.clientName = fallbackClientName - } else if dc.clientName != fallbackClientName { + } else if fallbackClientName != "" && dc.clientName != fallbackClientName { return ircError{&irc.Message{ Command: irc.ERR_ERRONEUSNICKNAME, Params: []string{dc.nick, "Client name mismatch in usernames"}, @@ -1298,7 +1298,7 @@ func (dc *downstreamConn) register(ctx context.Context) error { } if dc.networkName == "" { dc.networkName = fallbackNetworkName - } else if dc.networkName != fallbackNetworkName { + } else if fallbackNetworkName != "" && dc.networkName != fallbackNetworkName { return ircError{&irc.Message{ Command: irc.ERR_ERRONEUSNICKNAME, Params: []string{dc.nick, "Network name mismatch in usernames"},