Add sanity checks to the ssl modules so that theres no possibility of an out of range...

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

diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index c93fde452d1f206f31281cf04eb42462cd9522ae..fb439db6f51be16f29e096515f0400cd39e392d7 100644 (file)
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for the SETNAME command */
 
@@ -27,17 +24,28 @@ class cmd_setname : public command_t
        {
                this->source = "m_setname.so";
                syntax = "<new-gecos>";
+               TRANSLATE2(TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               std::string line = "";
-               for (int i = 0; i < pcnt-1; i++)
+               if (!*parameters[0])
                {
-                       line = line + std::string(parameters[i]) + " ";
+                       user->WriteServ("NOTICE %s :*** SETNAME: GECOS must be specified", user->nick);
+                       return CMD_FAILURE;
+               }
+               
+               if (strlen(parameters[0]) > MAXGECOS)
+               {
+                       user->WriteServ("NOTICE %s :*** SETNAME: GECOS too long", user->nick);
+                       return CMD_FAILURE;
+               }
+               
+               if (user->ChangeName(parameters[0]))
+               {
+                       ServerInstance->WriteOpers("%s used SETNAME to change their GECOS to %s", user->nick, parameters[0]);
+                       return CMD_SUCCESS;
                }
-               line = line + std::string(parameters[pcnt-1]);
-               user->ChangeName(line.c_str());
 
                return CMD_SUCCESS;
        }
@@ -62,34 +70,9 @@ class ModuleSetName : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetNameFactory : public ModuleFactory
-{
- public:
-       ModuleSetNameFactory()
-       {
-       }
-       
-       ~ModuleSetNameFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSetName(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleSetNameFactory;
-}
-
+MODULE_INIT(ModuleSetName)