summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/commands/cmd_oper.cpp2
-rw-r--r--src/commands/cmd_who.cpp6
-rw-r--r--src/modules/extra/m_sqloper.cpp2
-rw-r--r--src/modules/extra/m_ssl_oper_cert.cpp2
-rw-r--r--src/modules/m_cgiirc.cpp4
-rw-r--r--src/modules/m_check.cpp2
-rw-r--r--src/modules/m_conn_umodes.cpp2
-rw-r--r--src/modules/m_customtitle.cpp2
-rw-r--r--src/modules/m_dccallow.cpp2
-rw-r--r--src/modules/m_ident.cpp2
-rw-r--r--src/modules/m_securelist.cpp2
11 files changed, 14 insertions, 14 deletions
diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index 076a77df2..145c1e6a5 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -21,7 +21,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
std::string xhost;
while (hl >> xhost)
{
- if (InspIRCd::Match(host, xhost, NULL) || InspIRCd::MatchCIDR(ip, xhost, NULL))
+ if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
{
return true;
}
diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index 6f8b91e75..dcb5e9d22 100644
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -73,9 +73,9 @@ bool CommandWho::whomatch(User* user, const char* matchtext)
else if (opt_realname)
match = InspIRCd::Match(user->fullname, matchtext);
else if (opt_showrealhost)
- match = InspIRCd::Match(user->host, matchtext);
+ match = InspIRCd::Match(user->host, matchtext, ascii_case_insensitive_map);
else if (opt_ident)
- match = InspIRCd::Match(user->ident, matchtext);
+ match = InspIRCd::Match(user->ident, matchtext, ascii_case_insensitive_map);
else if (opt_port)
{
irc::portparser portrange(matchtext, false);
@@ -106,7 +106,7 @@ bool CommandWho::whomatch(User* user, const char* matchtext)
* -- w00t
*/
if (!match)
- match = InspIRCd::Match(user->dhost, matchtext);
+ match = InspIRCd::Match(user->dhost, matchtext, ascii_case_insensitive_map);
if (!match)
match = InspIRCd::Match(user->nick, matchtext);
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index d937c4336..3dc175f1f 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -80,7 +80,7 @@ public:
std::string xhost;
while (hl >> xhost)
{
- if (InspIRCd::Match(host, xhost, NULL) || InspIRCd::MatchCIDR(ip, xhost, NULL))
+ if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
{
return true;
}
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index fb7162a1f..9ef35f7a3 100644
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -99,7 +99,7 @@ class ModuleOperSSLCert : public Module
std::string xhost;
while (hl >> xhost)
{
- if (InspIRCd::Match(host, xhost) || InspIRCd::MatchCIDR(ip, xhost))
+ if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
{
return true;
}
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 3cb4da3e1..8d7bc1634 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -68,7 +68,7 @@ class CommandWebirc : public Command
for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
{
- if(InspIRCd::Match(user->host, iter->hostmask) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask))
+ if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
{
if(iter->type == WEBIRC && parameters[0] == iter->password)
{
@@ -264,7 +264,7 @@ public:
{
for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
{
- if(InspIRCd::Match(user->host, iter->hostmask) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask))
+ if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
{
// Deal with it...
if(iter->type == PASS)
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 1f142014e..2d03ceff0 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -130,7 +130,7 @@ class CommandCheck : public Command
/* hostname or other */
for (user_hash::const_iterator a = ServerInstance->Users->clientlist->begin(); a != ServerInstance->Users->clientlist->end(); a++)
{
- if (InspIRCd::Match(a->second->host, parameters[0]) || InspIRCd::Match(a->second->dhost, parameters[0]))
+ if (InspIRCd::Match(a->second->host, parameters[0], ascii_case_insensitive_map) || InspIRCd::Match(a->second->dhost, parameters[0], ascii_case_insensitive_map))
{
/* host or vhost matches mask */
user->WriteServ(checkstr + " match " + ConvToStr(++x) + " " + a->second->GetFullRealHost());
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 6abf416aa..f63c13e36 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -64,7 +64,7 @@ class ModuleModesOnConnect : public Module
{
std::string hostn = Conf->ReadValue("connect","allow",j);
/* XXX: Fixme: does not respect port, limit, etc */
- if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
+ if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
{
std::string ThisModes = Conf->ReadValue("connect","modes",j);
if (!ThisModes.empty())
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index a3aabadc7..cc9422b39 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -33,7 +33,7 @@ class CommandTitle : public Command
std::string xhost;
while (hl >> xhost)
{
- if (InspIRCd::Match(host, xhost) || InspIRCd::MatchCIDR(ip,xhost))
+ if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map))
{
return true;
}
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index da66d318a..7edcdfeb0 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -345,7 +345,7 @@ class ModuleDCCAllow : public Module
for (unsigned int i = 0; i < bfl.size(); i++)
{
- if (InspIRCd::Match(filename, bfl[i].filemask))
+ if (InspIRCd::Match(filename, bfl[i].filemask, ascii_case_insensitive_map))
{
if (bfl[i].action == "allow")
return 0;
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index b715f437c..0a777cf22 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -370,7 +370,7 @@ class ModuleIdent : public Module
{
std::string hostn = Conf->ReadValue("connect","allow",j);
/* XXX: Fixme: does not respect port, limit, etc */
- if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
+ if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
{
bool useident = Conf->ReadFlag("connect", "useident", j);
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 2a693836c..538fd4545 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -64,7 +64,7 @@ class ModuleSecureList : public Module
{
/* Normally wouldnt be allowed here, are they exempt? */
for (std::vector<std::string>::iterator x = allowlist.begin(); x != allowlist.end(); x++)
- if (InspIRCd::Match(user->MakeHost(), *x))
+ if (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map))
return 0;
/* Not exempt, BOOK EM DANNO! */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 19:52:11 +0000