From 3f0a66ce0636726c5b16c291f59e59f6ae7edaf7 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Tue, 9 Oct 2018 19:53:37 +0100 Subject: Fix sending malformed ERR_BANLISTFULL numerics in some contexts. Fixes ircdocs/irc-defs#37. --- src/modes/cmode_b.cpp | 3 ++- src/modules/m_banredirect.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index e45f191f7..5383f40da 100644 --- a/src/modes/cmode_b.cpp +++ b/src/modes/cmode_b.cpp @@ -118,7 +118,8 @@ std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan long maxbans = chan->GetMaxBans(); if (IS_LOCAL(user) && ((unsigned)chan->bans.size() >= (unsigned)maxbans)) { - user->WriteServ("478 %s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str(), maxbans); + user->WriteServ("478 %s %s %c :Channel ban list for %s is full (maximum entries for this channel is %ld)", + user->nick.c_str(), chan->name.c_str(), mode, chan->name.c_str(), maxbans); dest.clear(); return dest; } diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 1d35c2934..3df8b5e66 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -80,7 +80,8 @@ class BanRedirect : public ModeWatcher if(adding && (channel->bans.size() > static_cast(maxbans))) { - source->WriteNumeric(478, "%s %s :Channel ban list for %s is full (maximum entries for this channel is %ld)", source->nick.c_str(), channel->name.c_str(), channel->name.c_str(), maxbans); + source->WriteNumeric(478, "%s %s %c :Channel ban list for %s is full (maximum entries for this channel is %ld)", + source->nick.c_str(), channel->name.c_str(), mode, channel->name.c_str(), maxbans); return false; } -- cgit v1.2.3 From 39ddf2fb7a4d030fc29a7d421e09394cd70dc9bf Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 26 Sep 2018 23:53:29 +0100 Subject: Fix exposing the ban reason when an xline is found in the bancache. --- src/usermanager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 2cb7ad511..f62d28faa 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -117,7 +117,11 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString()); if (!ServerInstance->Config->MoronBanner.empty()) New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner.c_str()); - this->QuitUser(New, b->Reason); + + if (ServerInstance->Config->HideBans) + this->QuitUser(New, b->Type + "-Lined", b->Reason.c_str()); + else + this->QuitUser(New, b->Reason); return; } else -- cgit v1.2.3 From 0d9c5a22626282403b322c2a433d08c17633e507 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Mon, 5 Nov 2018 22:59:02 +0000 Subject: Release v2.0.27 --- src/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/version.sh b/src/version.sh index b082ad6e1..0467e8f21 100755 --- a/src/version.sh +++ b/src/version.sh @@ -1,2 +1,2 @@ #!/bin/sh -echo "InspIRCd-2.0.26" +echo "InspIRCd-2.0.27" -- cgit v1.2.3