5 files changed, 24 insertions, 9 deletions
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
index 538a27a37..3f84adc28 100644
--- a/modules/protocol/inspircd.cpp
+++ b/modules/protocol/inspircd.cpp
@@ -101,6 +101,7 @@ namespace
 
 class InspIRCdProto final
 	: public IRCDProto
+	, public SASL::ProtocolInterface
 {
 private:
 	static Anope::string GetAccountNicks(NickAlias* na)
@@ -155,7 +156,10 @@ private:
 public:
 	PrimitiveExtensibleItem<ListLimits> maxlist;
 
-	InspIRCdProto(Module *creator) : IRCDProto(creator, "InspIRCd 3+"), maxlist(creator, "maxlist")
+	InspIRCdProto(Module *creator)
+		: IRCDProto(creator, "InspIRCd 3+")
+		, SASL::ProtocolInterface(creator)
+		, maxlist(creator, "maxlist")
 	{
 		DefaultPseudoclientModes = "+oI";
 		CanSVSNick = true;
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 252134470..7bfcd4948 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -18,9 +18,12 @@ static ServiceReference<IRCDProto> hybrid("IRCDProto", "hybrid");
 
 class PlexusProto final
 	: public IRCDProto
+	, SASL::ProtocolInterface
 {
 public:
-	PlexusProto(Module *creator) : IRCDProto(creator, "hybrid-7.2.3+plexus-3.0.1")
+	PlexusProto(Module *creator)
+		: IRCDProto(creator, "hybrid-7.2.3+plexus-3.0.1")
+		, SASL::ProtocolInterface(creator)
 	{
 		DefaultPseudoclientModes = "+iU";
 		CanSVSNick = true;
diff --git a/modules/protocol/solanum.cpp b/modules/protocol/solanum.cpp
index fa05daf46..ab2d71b25 100644
--- a/modules/protocol/solanum.cpp
+++ b/modules/protocol/solanum.cpp
@@ -32,10 +32,12 @@ public:
 
 class SolanumProto final
 	: public IRCDProto
+	, public SASL::ProtocolInterface
 {
 public:
-
-	SolanumProto(Module *creator) : IRCDProto(creator, "Solanum")
+	SolanumProto(Module *creator)
+		: IRCDProto(creator, "Solanum")
+		, SASL::ProtocolInterface(creator)
 	{
 		DefaultPseudoclientModes = "+oiS";
 		CanCertFP = true;
diff --git a/modules/protocol/unrealircd.cpp b/modules/protocol/unrealircd.cpp
index aed578c3e..35df271d7 100644
--- a/modules/protocol/unrealircd.cpp
+++ b/modules/protocol/unrealircd.cpp
@@ -36,6 +36,7 @@ namespace
 
 class UnrealIRCdProto final
 	: public IRCDProto
+	, public SASL::ProtocolInterface
 {
 public:
 	PrimitiveExtensibleItem<ModData> ClientModData;
@@ -43,6 +44,7 @@ public:
 
 	UnrealIRCdProto(Module *creator)
 		: IRCDProto(creator, "UnrealIRCd 6+")
+		, SASL::ProtocolInterface(creator)
 		, ClientModData(creator, "ClientModData")
 		, ChannelModData(creator, "ChannelModData")
 	{
diff --git a/modules/sasl.cpp b/modules/sasl.cpp
index 795a76bf3..bbbdda696 100644
--- a/modules/sasl.cpp
+++ b/modules/sasl.cpp
@@ -292,7 +292,7 @@ public:
 		msg.type = mtype;
 		msg.data.push_back(data);
 
-		IRCD->SendSASLMessage(msg);
+		protocol_interface->SendSASLMessage(msg);
 	}
 
 	void Succeed(Session *session, NickCore *nc) override
@@ -310,7 +310,7 @@ public:
 		}
 		else
 		{
-			IRCD->SendSVSLogin(session->uid, na);
+			protocol_interface->SendSVSLogin(session->uid, na);
 		}
 		this->SendMessage(session, "D", "S");
 	}
@@ -397,20 +397,23 @@ class ModuleSASL final
 	void CheckMechs()
 	{
 		std::vector<Anope::string> newmechs = ::Service::GetServiceKeys("SASL::Mechanism");
-		if (newmechs == mechs)
+		if (newmechs == mechs || !protocol_interface)
 			return;
 
 		mechs = newmechs;
 
 		// If we are connected to the network then broadcast the mechlist.
 		if (Me && Me->IsSynced())
-			IRCD->SendSASLMechanisms(mechs);
+			protocol_interface->SendSASLMechanisms(mechs);
 	}
 
 public:
 	ModuleSASL(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
 		sasl(this), anonymous(this), plain(this)
 	{
+		if (!protocol_interface)
+			throw ModuleException("Your IRCd does not support SASL");
+
 		try
 		{
 			external = new External(this);
@@ -437,7 +440,8 @@ public:
 	void OnPreUplinkSync(Server *) override
 	{
 		// We have not yet sent a mechanism list so always do it here.
-		IRCD->SendSASLMechanisms(mechs);
+		if (!protocol_interface)
+			protocol_interface->SendSASLMechanisms(mechs);
 	}
 };