Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

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

diff --git a/src/modules/m_sanick.cpp b/src/modules/m_sanick.cpp
index 5758bac64ec704654b9487eade6467e776bdb462..0ce9338a43f4feff165e23a64416d80b37064536 100644 (file)
--- a/src/modules/m_sanick.cpp
+++ b/src/modules/m_sanick.cpp
@@ -37,29 +37,39 @@ class cmd_sanick : public command_t
                syntax = "<nick> <new-nick>";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                userrec* source = ServerInstance->FindNick(parameters[0]);
                if (source)
                {
-                       if (ServerInstance->is_uline(source->server))
+                       if (ServerInstance->ULine(source->server))
                        {
                                user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
                        if (ServerInstance->IsNick(parameters[1]))
                        {
-                               // FIX by brain: Cant use source->nick here because if it traverses a server link then
-                               // source->nick becomes invalid as the object data moves in memory.
-                               ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
-                               if (!source->ForceNickChange(parameters[1]))
+                               if (source->ForceNickChange(parameters[1]))
+                               {
+                                       ServerInstance->WriteOpers(std::string(user->nick)+" used SANICK to change "+std::string(parameters[0])+" to "+parameters[1]);
+                                       return CMD_SUCCESS;
+                               }
+                               else
                                {
                                        /* We couldnt change the nick */
-                                       userrec::QuitUser(ServerInstance, source, "Nickname collision");
-                                       return;
+                                       ServerInstance->WriteOpers(std::string(user->nick)+" failed SANICK (from "+std::string(parameters[0])+" to "+parameters[1]+")");
+                                       return CMD_FAILURE;
                                }
                        }
+                       else
+                       {
+                               user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[1]);
+                       }
+
+                       return CMD_FAILURE;
                }
+
+               return CMD_FAILURE;
        }
 };