Merge pull request #1139 from johanna-a/master

[user/henk/code/inspircd.git] / src / coremods / core_xline / cmd_zline.cpp

diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index 5eeebf1752bd2916785e9776ba517d6a6cede45b..859be1004857e905cb2b9ef14cb8510e9378df8c 100644 (file)
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -59,7 +59,8 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
                        ipaddr++;
                }
 
-               if (ServerInstance->IPMatchesEveryone(ipaddr,user))
+               IPMatcher matcher;
+               if (InsaneBan::MatchesEveryone(ipaddr, matcher, user, "Z", "ipmasks"))
                        return CMD_FAILURE;
 
                unsigned long duration = InspIRCd::Duration(parameters[1]);
@@ -100,3 +101,8 @@ CmdResult CommandZline::Handle (const std::vector<std::string>& parameters, User
 
        return CMD_SUCCESS;
 }
+
+bool CommandZline::IPMatcher::Check(User* user, const std::string& ip) const
+{
+       return InspIRCd::Match(user->GetIPString(), ip, ascii_case_insensitive_map);
+}