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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index d6565ce11..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.
  *
@@ -54,9 +51,14 @@ CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
 	/* 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 */
-		ServerInstance->next_call = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
-		FOREACH_MOD(I_OnUserRegister,OnUserRegister(user));
+		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;