diff options
| author | Peter Powell <petpow@saberuk.com> | 2018-11-07 10:58:42 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2018-11-07 11:20:10 +0000 |
| commit | 77730fd5f09f8fc193205654c8bba84d34365670 (patch) | |
| tree | 23877567a613e9520797bcbd923b7ae38632f616 /src | |
| parent | 79892a727e323dcc4bce7e9c0cf3c99c5fe61706 (diff) | |
| parent | 0d9c5a22626282403b322c2a433d08c17633e507 (diff) | |
Merge tag 'v2.0.27' into master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/listmode.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_banredirect.cpp | 2 | ||||
| -rw-r--r-- | src/usermanager.cpp | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/listmode.cpp b/src/listmode.cpp index 74977b866..d5dbec30e 100644 --- a/src/listmode.cpp +++ b/src/listmode.cpp @@ -227,7 +227,7 @@ void ListModeBase::OnParameterMissing(User*, User*, Channel*) void ListModeBase::TellListTooLong(User* source, Channel* channel, std::string& parameter) { - source->WriteNumeric(ERR_BANLISTFULL, channel->name, parameter, "Channel ban list is full"); + source->WriteNumeric(ERR_BANLISTFULL, channel->name, parameter, mode, "Channel ban list is full"); } void ListModeBase::TellAlreadyOnList(User*, Channel*, std::string&) diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 5ec75f13c..7246527d3 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -82,7 +82,7 @@ class BanRedirect : public ModeWatcher ListModeBase::ModeList* list = banlm->GetList(channel); if ((list) && (adding) && (maxbans <= list->size())) { - source->WriteNumeric(ERR_BANLISTFULL, channel->name, InspIRCd::Format("Channel ban list for %s is full (maximum entries for this channel is %u)", channel->name.c_str(), maxbans)); + source->WriteNumeric(ERR_BANLISTFULL, channel->name, banlm->GetModeChar(), InspIRCd::Format("Channel ban list for %s is full (maximum entries for this channel is %u)", channel->name.c_str(), maxbans)); return false; } diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 7466f385b..968d5db00 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -130,7 +130,11 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString()); if (!ServerInstance->Config->XLineMessage.empty()) New->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage); - this->QuitUser(New, b->Reason); + + if (ServerInstance->Config->HideBans) + this->QuitUser(New, b->Type + "-Lined", &b->Reason); + else + this->QuitUser(New, b->Reason); return; } else |