parameters[0] -> parameter.c_str()

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

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 4e2ebcf6e425de17bdc7797a0dac2c03475dd4b5..10add019f3fac4d479b2f24219f4505a722ece81 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,24 +73,17 @@ 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]);
-               if (InUse && (InUse != user) && (ServerInstance->IsNick(parameters[0])))
+               userrec* InUse = ServerInstance->FindNickOnly(parameters[0]);
+               if (InUse && (InUse != user) && ((ServerInstance->IsNick(parameters[0]) || allowinvalid)))
                {
                        if (InUse->registered != REG_ALL)
                        {
-                               /* change the nick of the older user to nnn-overruled,
-                                * where nnn is their file descriptor. We know this to be unique.
-                                * NOTE: We must do this and not quit the user, even though we do
-                                * not have UID support yet. This is because if we set this user
-                                * as quitting and then introduce the new user before the old one
-                                * has quit, then the user hash gets totally buggered.
-                                * (Yes, that is a technical term). -- Brain
+                               /* change the nick of the older user to its UUID
                                 */
-                               std::string changeback = ConvToStr(InUse->GetFd()) + "-overruled";
-                               InUse->WriteTo(InUse, "NICK %s", changeback.c_str());
+                               InUse->WriteTo(InUse, "NICK %s", InUse->uuid);
                                InUse->WriteServ("433 %s %s :Nickname overruled.", InUse->nick, InUse->nick);
-                               InUse->UpdateNickHash(changeback.c_str());
-                               strlcpy(InUse->nick, changeback.c_str(), NICKMAX - 1);
+                               InUse->UpdateNickHash(InUse->uuid);
+                               strlcpy(InUse->nick, InUse->uuid, NICKMAX - 1);
                                InUse->InvalidateCache();
                                /* Take away their nickname-sent state forcing them to send a nick again */
                                InUse->registered &= ~REG_NICK;
@@ -105,10 +95,13 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                }
        }
-       if ((!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)
@@ -187,3 +180,9 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 
 }
 
+CmdResult cmd_nick::HandleInternal(const unsigned int id, const std::deque<classbase*> &parameters)
+{
+       allowinvalid = (id != 0);
+       return CMD_SUCCESS;
+}
+