X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_user.cpp;h=b889455fde541f46cabc76fe164a235ecc0ae057;hb=b844d1cbbe79585facc69b9247baa8427cff0b62;hp=13e42f04335c7e662d680a5c8c17c57810dfa359;hpb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 13e42f043..b889455fd 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -2,12 +2,9 @@
  *       | 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.
  *
@@ -25,7 +22,7 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 	return new cmd_user(Instance);
 }
 
-void cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
+CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
 {
 	if (user->registered < REG_NICKUSER)
 	{
@@ -33,6 +30,7 @@ void cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
 			// 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 {
 			/* We're not checking ident, but I'm not sure I like the idea of '~' prefixing.. */
@@ -48,13 +46,20 @@ void cmd_user::Handle (const char** parameters, int pcnt, userrec *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;
 }