Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index fc5ed7bb1afd0b93a45ce1a7e988a8ee46ab9fed..42e70c1df4ca988e1a4113201acec65001ed0a63 100644 (file)
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -11,13 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "users.h"
+#include "inspircd.h"
 #include "commands/cmd_user.h"
 
-
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_user(Instance);
 }
@@ -27,22 +24,24 @@ CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
        /* A user may only send the USER command once */
        if (!(user->registered & REG_USER))
        {
-               if (!*parameters[3] || !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);
+                       /*
+                        * RFC says we must use this numeric, so we do. Let's make it a little more nub friendly though. :)
+                        *  -- Craig, and then w00t.
+                        */
+                       user->WriteServ("461 %s USER :Your username is not valid",user->nick);
                        return CMD_FAILURE;
                }
                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
+                       /*
+                        * 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);
                }
        }
@@ -51,7 +50,8 @@ CmdResult cmd_user::Handle (const char** parameters, int pcnt, userrec *user)
                user->WriteServ("462 %s :You may not reregister",user->nick);
                return CMD_FAILURE;
        }
-       /* parameters 2 and 3 are local and remote hosts, ignored when sent by client connection */
+
+       /* parameters 2 and 3 are local and remote hosts, and are ignored */
        if (user->registered == REG_NICKUSER)
        {
                int MOD_RESULT = 0;