X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_user.cpp;h=1a0e392c6ad2eb24caf5bb4bb0ab60e9bb82923a;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=79bb9c69117150975b3ca43a275172bc4e06896d;hpb=d02a5866d4fdedec9219aeca0a6048828b394fd2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 79bb9c691..1a0e392c6 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -2,56 +2,67 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "configreader.h"
 #include "users.h"
-#include "commands.h"
-#include "helperfuncs.h"
 #include "commands/cmd_user.h"
 
-extern InspIRCd* ServerInstance;
 
-void cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
+
+extern "C" command_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_user(Instance);
+}
+
+CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	if (user->registered < REG_NICKUSER)
+	/* A user may only send the USER command once */
+	if (!(user->registered & REG_USER))
 	{
-		if (!ServerInstance->IsIdent(parameters[0])) {
+		if (!ServerInstance->IsIdent(parameters[0]))
+		{
 			// This kinda Sucks, According to the RFC thou, its either this,
 			// or "You have already registered" :p -- Craig
 			user->WriteServ("461 %s USER :Not enough parameters",user->nick);
+			return CMD_FAILURE;
 		}
-		else {
+		else
+		{
 			/* We're not checking ident, but I'm not sure I like the idea of '~' prefixing.. */
-			/* XXX - Should this IDENTMAX + 1 be IDENTMAX - 1? Ok, users.h has it defined as
-			 * char ident[IDENTMAX+2]; - WTF?
+			/* XXX - The ident field is IDENTMAX+2 in size to account for +1 for the optional
+			 * ~ character, and +1 for null termination, therefore we can safely use up to
+			 * IDENTMAX here.
 			 */
 			strlcpy(user->ident, parameters[0], IDENTMAX);
-			strlcpy(user->fullname,parameters[3],MAXGECOS);
+			strlcpy(user->fullname, *parameters[3] ? parameters[3] : "No info", MAXGECOS);
 			user->registered = (user->registered | REG_USER);
 		}
 	}
 	else
 	{
 		user->WriteServ("462 %s :You may not reregister",user->nick);
-		return;
+		return CMD_FAILURE;
 	}
 	/* parameters 2 and 3 are local and remote hosts, ignored when sent by client connection */
 	if (user->registered == REG_NICKUSER)
 	{
+		int MOD_RESULT = 0;
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
-		//ConnectUser(user,NULL);
+		if (ServerInstance->next_call > ServerInstance->Time() + ServerInstance->Config->dns_timeout)
+			ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
+		FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
+		if (MOD_RESULT > 0)
+			return CMD_FAILURE;
+
 	}
+
+	return CMD_SUCCESS;
 }