/who tidyup - needs QA'ing

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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index 66ee2c75d256335044706232937d7548152c3710..82949a665f80d393a28575563c97f9209e0bb100 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,7 +24,8 @@ 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])) {
                        // This kinda Sucks, According to the RFC thou, its either this,
@@ -35,7 +33,8 @@ CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
                        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