From c0fbc7908da29f79f88141012a2bc5b85ab93893 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Fri, 30 Jun 2017 11:06:10 +1000 Subject: [PATCH] sasl: Always send a 906 in response to AUTHENTICATE * --- irc/accounts.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/irc/accounts.go b/irc/accounts.go index ba06f852..f7f42c65 100644 --- a/irc/accounts.go +++ b/irc/accounts.go @@ -90,11 +90,7 @@ func loadAccount(server *Server, tx *buntdb.Tx, accountKey string) *ClientAccoun func authenticateHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool { // sasl abort if !server.accountAuthenticationEnabled || len(msg.Params) == 1 && msg.Params[0] == "*" { - if client.saslInProgress { - client.Send(nil, server.name, ERR_SASLABORTED, client.nick, "SASL authentication aborted") - } else { - client.Send(nil, server.name, ERR_SASLFAIL, client.nick, "SASL authentication failed") - } + client.Send(nil, server.name, ERR_SASLABORTED, client.nick, "SASL authentication aborted") client.saslInProgress = false client.saslMechanism = "" client.saslValue = ""