diff options
| author |  Adam | 2013-05-15 12:33:47 -0700 |
|---|---|---|
| committer | Adam | 2013-05-15 12:33:47 -0700 |
| commit | e586aaab7c4f7b03514c83451d73b73f55dc6998 (patch) | |
| tree | 18f4370778cc79d2f21a4308dafbb29a77cfa213 /src/modules/m_sqloper.cpp | |
| parent | Merge pull request #523 from SaberUK/master+server-notice (diff) | |
| parent | Replace some C-isms with C++-isms. (diff) | |
Merge pull request #531 from SaberUK/master+snprintf-removal
Replace some C-isms with C++-isms.
Diffstat (limited to 'src/modules/m_sqloper.cpp')
| -rw-r--r-- | src/modules/m_sqloper.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/modules/m_sqloper.cpp b/src/modules/m_sqloper.cpp index b5b020d9d..87ab7d46f 100644 --- a/src/modules/m_sqloper.cpp +++ b/src/modules/m_sqloper.cpp @@ -23,20 +23,6 @@ /* $ModDesc: Allows storage of oper credentials in an SQL table */ -static bool OneOfMatches(const char* host, const char* ip, const std::string& hostlist) -{ - std::stringstream hl(hostlist); - std::string xhost; - while (hl >> xhost) - { - if (InspIRCd::Match(host, xhost, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(ip, xhost, ascii_case_insensitive_map)) - { - return true; - } - } - return false; -} - class OpMeQuery : public SQLQuery { public: @@ -106,7 +92,7 @@ class OpMeQuery : public SQLQuery hostname.append("@").append(user->host); - if (OneOfMatches(hostname.c_str(), user->GetIPString().c_str(), pattern.c_str())) + if (InspIRCd::MatchMask(pattern, hostname, user->GetIPString())) { /* Opertype and host match, looks like this is it. */ |