Merge pull request #155 from SaberUK/2.0+sasl-reauth

Fix logging into accounts with SASL on servers that support reauth.

1 files changed, 11 insertions, 1 deletions

diff --git a/modules/m_sasl.cpp b/modules/m_sasl.cpp
index 98a554259..ef29a1b45 100644
--- a/modules/m_sasl.cpp
+++ b/modules/m_sasl.cpp
@@ -223,7 +223,17 @@ class SASLService : public SASL::Service, public Timer
 
 	void Succeed(Session *session, NickCore *nc) anope_override
 	{
-		IRCD->SendSVSLogin(session->uid, nc->display);
+		// If the user is already introduced then we log them in now.
+		// Otherwise, we send an SVSLOGIN to log them in later.
+		User *user = User::Find(session->uid);
+		if (user)
+		{
+			user->Login(nc);
+		}
+		else
+		{
+			IRCD->SendSVSLogin(session->uid, nc->display);
+		}
 		this->SendMessage(session, "D", "S");
 	}