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_chgident.cpp

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 5bc70e3d7e5490324890778c1bb52a158ec8906e..1c9e3f6f4e843492937db02bbfbaa7acc95b303e 100644 (file)
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
@@ -11,13 +11,13 @@
 class cmd_chgident : public command_t
 {
  public:
- cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
+       cmd_chgident (InspIRCd* Instance) : command_t(Instance,"CHGIDENT", 'o', 2)
        {
                this->source = "m_chgident.so";
                syntax = "<nick> <newident>";
        }
        
-       void Handle(const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
                userrec* dest = ServerInstance->FindNick(parameters[0]);
 
@@ -26,15 +26,17 @@ class cmd_chgident : public command_t
                        if(!ServerInstance->IsIdent(parameters[1]))
                        {
                                user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-                               return;
+                               return CMD_FAILURE;
                        }
                
                        ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident from '%s' to '%s'", user->nick, dest->nick, dest->ident, parameters[1]);
-                       strlcpy(dest->ident, parameters[1], IDENTMAX+2);
+                       dest->ChangeIdent(parameters[1]);
+                       return CMD_SUCCESS;
                }
                else
                {
                        user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       return CMD_FAILURE;
                }
        }
 };