Merge branch 'master+gnutlsprio'

[user/henk/code/inspircd.git] / src / modules / m_sasl.cpp

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 0a2c840bd0205eb0905ff9484ff08c3eb772815a..341b3aea7166139068f75039e4ebc1b101e98bb4 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -28,12 +28,13 @@ enum SaslState { SASL_INIT, SASL_COMM, SASL_DONE };
 enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 
 static std::string sasl_target = "*";
+static Events::ModuleEventProvider* saslevprov;
 
 static void SendSASL(const parameterlist& params)
 {
        if (!ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params))
        {
-               SASLFallback(NULL, params);
+               FOREACH_MOD_CUSTOM(*saslevprov, SASLEventListener, OnSASLAuth, (params));
        }
 }
 
@@ -95,6 +96,9 @@ class SaslAuthenticator
                        if (msg[0] != this->agent)
                                return this->state;
 
+                       if (msg.size() < 4)
+                               return this->state;
+
                        if (msg[2] == "C")
                                this->user->Write("AUTHENTICATE %s", msg[3].c_str());
                        else if (msg[2] == "D")
@@ -246,6 +250,7 @@ class ModuleSASL : public Module
        GenericCap cap;
        CommandAuthenticate auth;
        CommandSASL sasl;
+       Events::ModuleEventProvider sasleventprov;
 
  public:
        ModuleSASL()
@@ -253,7 +258,9 @@ class ModuleSASL : public Module
                , cap(this, "sasl")
                , auth(this, authExt, cap)
                , sasl(this, authExt)
+               , sasleventprov(this, "event/sasl")
        {
+               saslevprov = &sasleventprov;
        }
 
        void init() CXX11_OVERRIDE
@@ -281,12 +288,7 @@ class ModuleSASL : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR);
-       }
-
-       void OnEvent(Event &ev) CXX11_OVERRIDE
-       {
-               cap.HandleEvent(ev);
+               return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE.", VF_VENDOR);
        }
 };