From 07272195deacd46ea6250438dad8978166944f9f Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 27 Apr 2021 02:09:39 +0100
Subject: Remove the SASL fallback event.

Nothing has ever used this and we can do better than this.
---
 src/modules/m_sasl.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/modules/m_sasl.cpp')

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 198639d0f..01c441f53 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -26,11 +26,10 @@
 
 
 #include "inspircd.h"
-#include "modules/cap.h"
 #include "modules/account.h"
-#include "modules/sasl.h"
-#include "modules/ssl.h"
+#include "modules/cap.h"
 #include "modules/server.h"
+#include "modules/ssl.h"
 
 enum
 {
@@ -158,8 +157,6 @@ class SASLCap : public Cap::Capability
 enum SaslState { SASL_INIT, SASL_COMM, SASL_DONE };
 enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 
-static Events::ModuleEventProvider* saslevprov;
-
 static void SendSASL(LocalUser* user, const std::string& agent, char mode, const std::vector<std::string>& parameters)
 {
 	CommandBase::Params params;
@@ -167,11 +164,7 @@ static void SendSASL(LocalUser* user, const std::string& agent, char mode, const
 	params.push_back(agent);
 	params.push_back(ConvToStr(mode));
 	params.insert(params.end(), parameters.begin(), parameters.end());
-
-	if (!ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params))
-	{
-		saslevprov->Call(&SASLEventListener::OnSASLAuth, params);
-	}
+	ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params);
 }
 
 static ClientProtocol::EventProvider* g_protoev;
@@ -403,7 +396,6 @@ class ModuleSASL : public Module
 	SASLCap cap;
 	CommandAuthenticate auth;
 	CommandSASL sasl;
-	Events::ModuleEventProvider sasleventprov;
 	ClientProtocol::EventProvider protoev;
 
  public:
@@ -414,10 +406,8 @@ class ModuleSASL : public Module
 		, cap(this, servertracker)
 		, auth(this, authExt, cap)
 		, sasl(this, authExt)
-		, sasleventprov(this, "event/sasl")
 		, protoev(this, auth.name)
 	{
-		saslevprov = &sasleventprov;
 		g_protoev = &protoev;
 	}
 
-- 
cgit v1.3.1-10-gc9f91