Dump sendq before closing socket

[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 3c3b1d2a00112dbd7f780bfb5e375953f0348f2c..8f48d1da9369752ac928ac7e537354504f78e582 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -26,7 +26,6 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 class SaslAuthenticator
 {
  private:
-       InspIRCd *ServerInstance;
        std::string agent;
        User *user;
        SaslState state;
@@ -226,8 +225,8 @@ class ModuleSASL : public Module
        ModuleSASL()
                : authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt)
        {
-               Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnSetConnectClass };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               Implementation eventlist[] = { I_OnEvent, I_OnUserRegister };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
 
                ServiceProvider* providelist[] = { &auth, &sasl, &authExt };
                ServerInstance->Modules->AddServices(providelist, 3);
@@ -248,21 +247,6 @@ class ModuleSASL : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
-       {
-               if (myclass->config->getBool("requiresasl"))
-               {
-                       const AccountExtItem* ext = GetAccountExtItem();
-                       if (ext && !ext->get(user))
-                               return MOD_RES_DENY;
-               }
-               return MOD_RES_PASSTHRU;
-       }
-
-       ~ModuleSASL()
-       {
-       }
-
        Version GetVersion()
        {
                return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR);