Added some missing parameter checking in m_swhois

[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 c1a6b3f07043cff014ad33fb2aa261c895679ae8..168adcc93c2f571c2ca129953c7de2f3e2541dc2 100644 (file)
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
 
@@ -33,23 +32,35 @@ class cmd_chgident : public command_t
        {
                userrec* dest = ServerInstance->FindNick(parameters[0]);
 
-               if(dest)
+               if (!dest)
                {
-                       if(!ServerInstance->IsIdent(parameters[1]))
-                       {
-                               user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-                               return CMD_FAILURE;
-                       }
+                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       return CMD_FAILURE;
+               }
 
-                       dest->ChangeIdent(parameters[1]);
-                       ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
-                       return CMD_SUCCESS;
+               if (!*parameters[1])
+               {
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident must be specified", user->nick);
+                       return CMD_FAILURE;
                }
-               else
+               
+               if (strlen(parameters[1]) > IDENTMAX)
                {
-                       user->WriteServ("401 %s %s :No such nick/channel", user->nick, parameters[0]);
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Ident is too long", user->nick);
                        return CMD_FAILURE;
                }
+               
+               if (!ServerInstance->IsIdent(parameters[1]))
+               {
+                       user->WriteServ("NOTICE %s :*** CHGIDENT: Invalid characters in ident", user->nick);
+                       return CMD_FAILURE;
+               }
+
+               dest->ChangeIdent(parameters[1]);
+               ServerInstance->WriteOpers("%s used CHGIDENT to change %s's ident to '%s'", user->nick, dest->nick, dest->ident);
+
+               /* route it! */
+               return CMD_SUCCESS;
        }
 };
 
@@ -60,7 +71,7 @@ class ModuleChgIdent : public Module
        
        
 public:
-       ModuleChgIdent(InspIRCd* Me) : Module::Module(Me)
+       ModuleChgIdent(InspIRCd* Me) : Module(Me)
        {
                mycommand = new cmd_chgident(ServerInstance);
                ServerInstance->AddCommand(mycommand);
@@ -77,29 +88,5 @@ public:
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgIdentFactory : public ModuleFactory
-{
- public:
-       ModuleChgIdentFactory()
-       {
-       }
-       
-       ~ModuleChgIdentFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChgIdent(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent)