X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=480f8f6db0d0ebc2ee559a80b705ae77417e6f8c;hb=9a312de26b742e9c399a84a70b175a88fb4bc1ac;hp=d37e1c90f8a0f93f3a50ddf891d627352b95c06d;hpb=384ef31bc01e4a1a2e59d082c9066002410ba54a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index d37e1c90f..480f8f6db 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -145,7 +145,7 @@ static Events::ModuleEventProvider* saslevprov;
 
 static void SendSASL(LocalUser* user, const std::string& agent, char mode, const std::vector<std::string>& parameters)
 {
-	CommandBase::Params params(parameters.size() + 3);
+	CommandBase::Params params;
 	params.push_back(user->uuid);
 	params.push_back(agent);
 	params.push_back(ConvToStr(mode));
@@ -157,6 +157,8 @@ static void SendSASL(LocalUser* user, const std::string& agent, char mode, const
 	}
 }
 
+static ClientProtocol::EventProvider* g_protoev;
+
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
@@ -223,7 +225,15 @@ class SaslAuthenticator
 				return this->state;
 
 			if (msg[2] == "C")
-				this->user->Write("AUTHENTICATE %s", msg[3].c_str());
+			{
+				ClientProtocol::Message authmsg("AUTHENTICATE");
+				authmsg.PushParamRef(msg[3]);
+
+				ClientProtocol::Event authevent(*g_protoev, authmsg);
+				LocalUser* const localuser = IS_LOCAL(user);
+				if (localuser)
+					localuser->Send(authevent);
+			}
 			else if (msg[2] == "D")
 			{
 				this->state = SASL_DONE;
@@ -377,6 +387,7 @@ class ModuleSASL : public Module
 	CommandAuthenticate auth;
 	CommandSASL sasl;
 	Events::ModuleEventProvider sasleventprov;
+	ClientProtocol::EventProvider protoev;
 
  public:
 	ModuleSASL()
@@ -386,8 +397,10 @@ class ModuleSASL : public Module
 		, auth(this, authExt, cap)
 		, sasl(this, authExt)
 		, sasleventprov(this, "event/sasl")
+		, protoev(this, auth.name)
 	{
 		saslevprov = &sasleventprov;
+		g_protoev = &protoev;
 	}
 
 	void init() CXX11_OVERRIDE