summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-01-13 14:01:16 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-01-13 14:01:16 +0100
commitd0a6b9c6eab666136af529953ebd585986a19848 (patch)
treef07096ae97bd91339ccdbde83aed118159a32144
parent7ce26772d93115e7c0a2644007351b57030710e6 (diff)
m_mlock Only deny the mlocked mode from being changed instead of denying the entire mode change if it contains a single mlocked mode
Fixes issue #615 reported by @BlacklightShining
-rw-r--r--src/modules/m_mlock.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 719701d02..d1df81354 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -31,7 +31,7 @@ public:
void init()
{
- ServerInstance->Modules->Attach(I_OnPreMode, this);
+ ServerInstance->Modules->Attach(I_OnRawMode, this);
ServerInstance->Modules->AddService(this->mlock);
}
@@ -40,12 +40,7 @@ public:
return Version("Implements the ability to have server-side MLOCK enforcement.", VF_VENDOR);
}
- void Prioritize()
- {
- ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
- }
-
- ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
+ ModResult OnRawMode(User* source, Channel* channel, const char mode, const std::string& parameter, bool adding, int pcnt)
{
if (!channel)
return MOD_RES_PASSTHRU;
@@ -57,11 +52,11 @@ public:
if (!mlock_str)
return MOD_RES_PASSTHRU;
- std::string::size_type p = parameters[1].find_first_of(*mlock_str);
+ std::string::size_type p = mlock_str->find(mode);
if (p != std::string::npos)
{
source->WriteNumeric(742, "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
- channel->name.c_str(), parameters[1][p], mlock_str->c_str());
+ channel->name.c_str(), mode, mlock_str->c_str());
return MOD_RES_DENY;
}