From a1a7b96a8c994eb09a3d071f3daf28252b8c188b Mon Sep 17 00:00:00 2001 From: w00t Date: Fri, 22 Aug 2008 16:14:36 +0000 Subject: Match conversion stuff. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10216 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_inviteexception.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/m_inviteexception.cpp') diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 98b1ab55e..3ea1c83fc 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -69,7 +69,7 @@ public: std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString(); for (modelist::iterator it = list->begin(); it != list->end(); it++) { - if(match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true))) + if(InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask))) { // They match an entry on the list, so let them in. return 1; @@ -94,7 +94,7 @@ public: std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString(); for (modelist::iterator it = list->begin(); it != list->end(); it++) { - if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask, true))) + if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask.c_str()) || (InspIRCd::MatchCIDR(mask, it->mask))) { // They match an entry return (char*)it->mask.c_str(); -- cgit v1.2.3