X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_setident.cpp;h=065c1d96dd65daca51ab82c56b14301cd12e8a52;hb=364735e18b500f0a071fab4cc5c9e7bace1835fc;hp=88375559823abeb8f7d3a0afb049359343411db9;hpb=66098d307c036997e51eaea21724615e27fdc3e9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index 883755598..065c1d96d 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,13 +1,11 @@
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
 
-
-extern InspIRCd* ServerInstance;
-
+/** Handle /SETIDENT
+ */
 class cmd_setident : public command_t
 {
  public:
@@ -17,19 +15,27 @@ class cmd_setident : public command_t
 		syntax = "<new-ident>";
 	}
 
-	void Handle(const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(const char** parameters, int pcnt, userrec *user)
 	{
-		for(unsigned int x = 0; x < strlen(parameters[0]); x++)
+		size_t len = 0;
+		for(const char* x = parameters[0]; *x; x++, len++)
 		{
-			if(((parameters[0][x] >= 'A') && (parameters[0][x] <= '}')) || strchr(".-0123456789", parameters[0][x]))
+			if(((*x >= 'A') && (*x <= '}')) || strchr(".-0123456789", *x))
 				continue;
-			
+
 			user->WriteServ("NOTICE %s :*** Invalid characters in ident", user->nick);
-			return;
+			return CMD_FAILURE;
 		}
-		
-		ServerInstance->WriteOpers("%s used SETIDENT to change their ident from '%s' to '%s'", user->nick, user->ident, parameters[0]);
-		strlcpy(user->ident, parameters[0], IDENTMAX+2);
+		if (len > IDENTMAX)
+		{
+			user->WriteServ("NOTICE %s :*** Ident is too long", user->nick);
+			return CMD_FAILURE;
+		}
+
+		user->ChangeIdent(parameters[0]);
+		ServerInstance->WriteOpers("%s used SETIDENT to change their ident to '%s'", user->nick, user->ident);
+
+		return CMD_SUCCESS;
 	}
 };
 
@@ -52,7 +58,7 @@ class ModuleSetIdent : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,0,0,0,VF_VENDOR,API_VERSION);
 	}
 	
 };