From 3c8009b4950a670618c3ee476f21f67a9468fdb2 Mon Sep 17 00:00:00 2001 From: Daniel Vassdal Date: Thu, 13 Feb 2014 09:29:39 -0800 Subject: sasl.h, m_sasl.cpp: Add RemoveSession(), DeleteSessions(), and have active sessions closed when a Mechanism is unloaded --- modules/protocol/charybdis.cpp | 4 ++-- modules/protocol/inspircd12.cpp | 6 +++--- modules/protocol/unreal.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'modules/protocol') diff --git a/modules/protocol/charybdis.cpp b/modules/protocol/charybdis.cpp index e9ea89673..a0c10be83 100644 --- a/modules/protocol/charybdis.cpp +++ b/modules/protocol/charybdis.cpp @@ -188,7 +188,7 @@ struct IRCDMessageEncap : IRCDMessage * * Charybdis only accepts messages from SASL agents; these must have umode +S */ - if (params[1] == "SASL" && sasl && params.size() >= 6) + if (params[1] == "SASL" && SASL::sasl && params.size() >= 6) { SASL::Message m; m.source = params[2]; @@ -197,7 +197,7 @@ struct IRCDMessageEncap : IRCDMessage m.data = params[5]; m.ext = params.size() > 6 ? params[6] : ""; - sasl->ProcessMessage(m); + SASL::sasl->ProcessMessage(m); } } }; diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index e64079dca..eded20306 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -873,7 +873,7 @@ struct IRCDMessageEncap : IRCDMessage if (Anope::Match(Me->GetSID(), params[0]) == false) return; - if (sasl && params[1] == "SASL" && params.size() >= 6) + if (SASL::sasl && params[1] == "SASL" && params.size() >= 6) { SASL::Message m; m.source = params[2]; @@ -882,7 +882,7 @@ struct IRCDMessageEncap : IRCDMessage m.data = params[5]; m.ext = params.size() > 6 ? params[6] : ""; - sasl->ProcessMessage(m); + SASL::sasl->ProcessMessage(m); } } }; @@ -1283,7 +1283,7 @@ struct IRCDMessageUID : IRCDMessage modes += " " + params[i]; NickAlias *na = NULL; - if (sasl) + if (SASL::sasl) for (std::list::iterator it = saslusers.begin(); it != saslusers.end();) { SASLUser &u = *it; diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp index e0f051aa6..f0d01ce9d 100644 --- a/modules/protocol/unreal.cpp +++ b/modules/protocol/unreal.cpp @@ -889,7 +889,7 @@ struct IRCDMessageSASL : IRCDMessage void Run(MessageSource &source, const std::vector ¶ms) anope_override { size_t p = params[1].find('!'); - if (!sasl || p == Anope::string::npos) + if (!SASL::sasl || p == Anope::string::npos) return; SASL::Message m; @@ -899,7 +899,7 @@ struct IRCDMessageSASL : IRCDMessage m.data = params[3]; m.ext = params.size() > 4 ? params[4] : ""; - sasl->ProcessMessage(m); + SASL::sasl->ProcessMessage(m); } }; -- cgit