summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/modules/sasl.h3
-rw-r--r--modules/nickserv/ns_sasl.cpp8
2 files changed, 4 insertions, 7 deletions
diff --git a/include/modules/sasl.h b/include/modules/sasl.h
index 648287f79..f23a5d32a 100644
--- a/include/modules/sasl.h
+++ b/include/modules/sasl.h
@@ -29,15 +29,12 @@ namespace SASL
virtual void ProcessMessage(const Message &) = 0;
- virtual Anope::string GetAgent() = 0;
-
virtual Session *GetSession(const Anope::string &uid) = 0;
virtual void SendMessage(SASL::Session *session, const Anope::string &type, const Anope::string &data) = 0;
virtual void Succeed(Session *, NickCore *) = 0;
virtual void Fail(Session *) = 0;
- virtual void SendMechs(Session *) = 0;
virtual void DeleteSessions(Mechanism *, bool = false) = 0;
virtual void RemoveSession(Session *) = 0;
};
diff --git a/modules/nickserv/ns_sasl.cpp b/modules/nickserv/ns_sasl.cpp
index 3b08c9e7c..58142466d 100644
--- a/modules/nickserv/ns_sasl.cpp
+++ b/modules/nickserv/ns_sasl.cpp
@@ -206,8 +206,8 @@ public:
{
SASL::Session tmp(NULL, m.source);
- SASL::service->SendMechs(&tmp);
- SASL::service->Fail(&tmp);
+ this->SendMechs(&tmp);
+ this->Fail(&tmp);
return;
}
@@ -255,7 +255,7 @@ public:
}
}
- Anope::string GetAgent() override
+ Anope::string GetAgent()
{
Anope::string agent = Config->GetModule(Service::owner).Get<Anope::string>("agent", "NickServ");
BotInfo *bi = Config->GetClient(agent);
@@ -355,7 +355,7 @@ public:
}
}
- void SendMechs(SASL::Session *session) override
+ void SendMechs(SASL::Session *session)
{
std::vector<Anope::string> mechs = Service::GetServiceKeys("SASL::Mechanism");
Anope::string buf;