Match conversion stuff.

[user/henk/code/inspircd.git] / src / modules / m_conn_umodes.cpp

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 2489f2a1f3166298627992041c495fc27f600061..097f8c8d6595d77f9ea66eae6e547504c625c9c1 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
 
@@ -64,7 +63,7 @@ class ModuleModesOnConnect : public Module
                {
                        std::string hostn = Conf->ReadValue("connect","allow",j);
                        /* XXX: Fixme: does not respect port, limit, etc */
-                       if ((match(user->GetIPString(),hostn,true)) || (match(user->host,hostn)))
+                       if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
                        {
                                std::string ThisModes = Conf->ReadValue("connect","modes",j);
                                if (!ThisModes.empty())