Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 06c1c87668e13e0e463c16644072bc18a952d241..93fdd560cca9b03143475dc4234b316dcafb6656 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
 #include "xline.h"
 #include "commands/cmd_nick.h"
 
@@ -76,7 +73,8 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                 * the nickname too, we force a nickchange on the older user (Simply the one who was
                 * here first, no TS checks need to take place here)
                 */
-               userrec* InUse = ServerInstance->FindNick(parameters[0]);
+               userrec* InUse = ServerInstance->FindNickOnly(parameters[0]);
+               ServerInstance->Log(DEBUG,"Nick in use");
                if (InUse && (InUse != user) && ((ServerInstance->IsNick(parameters[0]) || allowinvalid)))
                {
                        if (InUse->registered != REG_ALL)
@@ -93,15 +91,19 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        else
                        {
+                               ServerInstance->Log(DEBUG,"Nick in use and user REG_ALL");
                                user->WriteServ("433 %s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0]);
                                return CMD_FAILURE;
                        }
                }
        }
-       if (((!allowinvalid || !ServerInstance->IsNick(parameters[0]))) && (IS_LOCAL(user)))
+       if (((!ServerInstance->IsNick(parameters[0]))) && (IS_LOCAL(user)))
        {
-               user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
-               return CMD_FAILURE;
+               if (!allowinvalid)
+               {
+                       user->WriteServ("432 %s %s :Erroneous Nickname",user->nick,parameters[0]);
+                       return CMD_FAILURE;
+               }
        }
 
        if (user->registered == REG_ALL)