Merge branch 'master+tlsversion'

[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 796d343ea6fa9fe1b5e69adff540e6d18c142a4d..0a2c840bd0205eb0905ff9484ff08c3eb772815a 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -31,7 +31,7 @@ static std::string sasl_target = "*";
 
 static void SendSASL(const parameterlist& params)
 {
-       if (!ServerInstance->PI->SendEncapsulatedData(params))
+       if (!ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params))
        {
                SASLFallback(NULL, params);
        }
@@ -54,8 +54,6 @@ class SaslAuthenticator
                : user(user_), state(SASL_INIT), state_announced(false)
        {
                parameterlist params;
-               params.push_back(sasl_target);
-               params.push_back("SASL");
                params.push_back(user->uuid);
                params.push_back("*");
                params.push_back("S");
@@ -132,8 +130,6 @@ class SaslAuthenticator
                        return true;
 
                parameterlist params;
-               params.push_back(sasl_target);
-               params.push_back("SASL");
                params.push_back(this->user->uuid);
                params.push_back(this->agent);
                params.push_back("C");
@@ -253,7 +249,10 @@ class ModuleSASL : public Module
 
  public:
        ModuleSASL()
-               : authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt)
+               : authExt("sasl_auth", ExtensionItem::EXT_USER, this)
+               , cap(this, "sasl")
+               , auth(this, authExt, cap)
+               , sasl(this, authExt)
        {
        }