Fixed bug #418 (incorrect numerics for part of /ADMIN and /USERS) - patch by Zaba

[user/henk/code/inspircd.git] / src / cmd_kline.cpp

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index eab027b7013574392a9a6b4df43ba0e4f22721dd..ec31228ed28cccc23a4fe096a588ed2999dac75f 100644 (file)
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_kline.h"
 
@@ -29,7 +26,8 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (pcnt >= 3)
        {
-               if (ServerInstance->HostMatchesEveryone(parameters[0],user))
+               IdentHostPair ih = ServerInstance->XLines->IdentSplit(parameters[0]);
+               if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user))
                        return CMD_FAILURE;
 
                if (!strchr(parameters[0],'@'))
@@ -64,6 +62,10 @@ CmdResult cmd_kline::Handle (const char** parameters, int pcnt, userrec *user)
 
                        ServerInstance->XLines->apply_lines(to_apply);
                }
+               else
+               {
+                       user->WriteServ("NOTICE %s :*** K-Line for %s already exists",user->nick,parameters[0]);
+               }
        }
        else
        {