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

1 files changed, 11 insertions, 1 deletions

diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index e31b91d0e..d5a3acf6f 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -235,7 +235,17 @@ class SASLService : public SASL::Service, public Timer
 
 	void Succeed(Session *session, NickServ::Account *nc) override
 	{
-		IRCD->SendSVSLogin(session->uid, nc->GetDisplay());
+		// 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->GetDisplay());
+		}
 		this->SendMessage(session, "D", "S");
 	}