summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2016-09-12 16:17:48 +0200
committerGitHub <noreply@github.com>2016-09-12 16:17:48 +0200
commite991c297d69d39438970f85b58010a447864d49e (patch)
tree1901cf9f8953133127a4e7bb4e893d862578def0
parentef23e4c07320fbbbf9d142878aae05a3e87eff0f (diff)
parent27b5df44ec546f9b9f3b2783a7505c920f101aad (diff)
Merge pull request #1210 from Adam-/insp20+saslnick
m_sasl: really abort sasl session on register
-rw-r--r--src/modules/m_sasl.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 16a15357f..649c21809 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -268,7 +268,7 @@ class ModuleSASL : public Module
void init()
{
OnRehash(NULL);
- Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnRehash };
+ Implementation eventlist[] = { I_OnEvent, I_OnUserConnect, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
ServiceProvider* providelist[] = { &auth, &sasl, &authExt };
@@ -283,7 +283,7 @@ class ModuleSASL : public Module
sasl_target = ServerInstance->Config->ConfValue("sasl")->getString("target", "*");
}
- ModResult OnUserRegister(LocalUser *user)
+ void OnUserConnect(LocalUser *user)
{
SaslAuthenticator *sasl_ = authExt.get(user);
if (sasl_)
@@ -291,8 +291,6 @@ class ModuleSASL : public Module
sasl_->Abort();
authExt.unset(user);
}
-
- return MOD_RES_PASSTHRU;
}
Version GetVersion()