Permalink
Browse files

Merge pull request #1210 from Adam-/insp20+saslnick

m_sasl: really abort sasl session on register
  • Loading branch information...
2 parents ef23e4c + 27b5df4 commit e991c297d69d39438970f85b58010a447864d49e @attilamolnar attilamolnar committed on GitHub Sep 12, 2016
Showing with 2 additions and 4 deletions.
  1. +2 −4 src/modules/m_sasl.cpp
View
6 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,16 +283,14 @@ 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_)
{
sasl_->Abort();
authExt.unset(user);
}
-
- return MOD_RES_PASSTHRU;
}
Version GetVersion()

0 comments on commit e991c29

Please sign in to comment.