Fix infinite loop on alias expansion, found by Adam

[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 938449bbb3f0a445cf8ca2727eff94779084ede6..8e1a73354782fef65ec538d5718b6fc62707aea2 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
-class SaslAuthenticator : public classbase
+class SaslAuthenticator
 {
  private:
        InspIRCd *ServerInstance;
@@ -232,7 +232,7 @@ class ModuleSASL : public Module
                ServerInstance->AddCommand(&auth);
                ServerInstance->AddCommand(&sasl);
 
-               Extensible::Register(&authExt);
+               ServerInstance->Extensions.Register(&authExt);
                if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so"))
                        ServerInstance->Logs->Log("m_sasl", DEFAULT, "WARNING: m_services_account.so and m_cap.so are not loaded! m_sasl.so will NOT function correctly until these two modules are loaded!");
        }
@@ -255,7 +255,7 @@ class ModuleSASL : public Module
 
        Version GetVersion()
        {
-               return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR,API_VERSION);
+               return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR);
        }
 
        void OnEvent(Event &ev)