From c16cda5d715241bb4bff8050bee942a8a34a72c0 Mon Sep 17 00:00:00 2001
From: w00t
Date: Thu, 21 Aug 2008 20:56:16 +0000
Subject: match() is no longer a function+no header, now a static method of
 InspIRCd class, blah blah blah. Also rip out the 1.2 matcher, as it was slow,
 and replace it with one adapted from znc, which happens to be a tiny bit
 faster than 1.1's (and the fastest I've seen so far that works properly)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10212 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/commands/cmd_oper.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/commands/cmd_oper.cpp')

diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp
index 97134f038..8522890e0 100644
--- a/src/commands/cmd_oper.cpp
+++ b/src/commands/cmd_oper.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "commands/cmd_oper.h"
 #include "hashcomp.h"
 
@@ -22,7 +21,7 @@ bool OneOfMatches(const char* host, const char* ip, const char* hostlist)
 	std::string xhost;
 	while (hl >> xhost)
 	{
-		if (match(host, xhost) || match(ip,xhost, true))
+		if (InspIRCd::MatchCIDR(host, xhost, NULL) || InspIRCd::MatchCIDR(ip, xhost, NULL))
 		{
 			return true;
 		}
-- 
cgit v1.3.1-10-gc9f91