Allow support for multiple dns results per request. This is a significant change...

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

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 5122781f18156897362e3619870a4c3f3c43e30a..ecdf63fb0b078e512f469d39b2d506d3958022dc 100644 (file)
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -30,21 +30,24 @@ class cmd_setident : public command_t
 
        CmdResult Handle(const char** parameters, int pcnt, userrec *user)
        {
-               size_t len = 0;
-               for(const char* x = parameters[0]; *x; x++, len++)
+               if (!*parameters[0])
                {
-                       if(((*x >= 'A') && (*x <= '}')) || strchr(".-0123456789", *x))
-                               continue;
-
-                       user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident must be specified", user->nick);
                        return CMD_FAILURE;
                }
-               if (len > IDENTMAX)
+               
+               if (strlen(parameters[0]) > IDENTMAX)
                {
-                       user->WriteServ("NOTICE %s :*** Ident is too long", user->nick);
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Ident is too long", user->nick);
                        return CMD_FAILURE;
                }
-
+               
+               if (!ServerInstance->IsIdent(parameters[0]))
+               {
+                       user->WriteServ("NOTICE %s :*** SETIDENT: Invalid characters in ident", user->nick);
+                       return CMD_FAILURE;
+               }
+               
                user->ChangeIdent(parameters[0]);
                ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
 
@@ -71,34 +74,10 @@ class ModuleSetIdent : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
-       }
-       
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSetIdentFactory : public ModuleFactory
-{
- public:
-       ModuleSetIdentFactory()
-       {
-       }
-       
-       ~ModuleSetIdentFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSetIdent(Me);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
 
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleSetIdentFactory;
-}
-
+MODULE_INIT(ModuleSetIdent)