From 1bdf114d37a2932138196d3438eddd30bf9d73a2 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Thu, 31 Aug 2017 22:51:58 +0100 Subject: Fix {Host,IP}MatchesEveryone using Match instead of MatchCIDR. MatchCIDR is what [GKZ]Line::Matches uses it so we should also use it here to prevent insane bans that should not pass from passing. --- src/commands.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/commands.cpp') diff --git a/src/commands.cpp b/src/commands.cpp index d805a1f65..5bf2aeb03 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -42,8 +42,8 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user) for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if ((InspIRCd::Match(u->second->MakeHost(), mask, ascii_case_insensitive_map)) || - (InspIRCd::Match(u->second->MakeHostIP(), mask, ascii_case_insensitive_map))) + if ((InspIRCd::MatchCIDR(u->second->MakeHost(), mask, ascii_case_insensitive_map)) || + (InspIRCd::MatchCIDR(u->second->MakeHostIP(), mask, ascii_case_insensitive_map))) { matches++; } @@ -74,7 +74,7 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user) for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map)) + if (InspIRCd::MatchCIDR(u->second->GetIPString(), ip, ascii_case_insensitive_map)) matches++; } -- cgit v1.2.3