A quick glance at ircu indicates that when an empty gecos is given in USER, it is...

[user/henk/code/inspircd.git] / src / cmd_user.cpp

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index f7a22eb0184a6abf59e6358043f979468779fc82..1a0e392c6ad2eb24caf5bb4bb0ab60e9bb82923a 100644 (file)
--- 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.
  *
@@ -27,22 +24,25 @@ extern "C" command_t* init_command(InspIRCd* 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 - 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);
                }
        }
@@ -54,8 +54,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 */
-               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;