Fix for bug found by danieldg, where remote nicks were truncated to NICKMAX, but...

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

diff --git a/src/commands/cmd_user.cpp b/src/commands/cmd_user.cpp
index be49deeac1727d5d21917efd84378b6744165189..09bbad034e176fb2beee0c56af2e146034932a0f 100644 (file)
--- a/src/commands/cmd_user.cpp
+++ b/src/commands/cmd_user.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,18 +19,18 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandUser(Instance);
 }
 
-CmdResult CommandUser::Handle (const char** parameters, int, User *user)
+CmdResult CommandUser::Handle (const std::vector<std::string>& parameters, User *user)
 {
        /* A user may only send the USER command once */
        if (!(user->registered & REG_USER))
        {
-               if (!ServerInstance->IsIdent(parameters[0]))
+               if (!ServerInstance->IsIdent(parameters[0].c_str()))
                {
                        /*
                         * 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);
+                       user->WriteNumeric(461, "%s USER :Your username is not valid",user->nick.c_str());
                        return CMD_FAILURE;
                }
                else
@@ -40,14 +40,14 @@ CmdResult CommandUser::Handle (const char** parameters, int, User *user)
                         * ~ 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] ? parameters[3] : "No info", MAXGECOS);
+                       user->ident.assign(parameters[0], 0, ServerInstance->Config->Limits.IdentMax);
+                       user->fullname.assign(parameters[3].empty() ? std::string("No info") : parameters[3], 0, ServerInstance->Config->Limits.MaxGecos);
                        user->registered = (user->registered | REG_USER);
                }
        }
        else
        {
-               user->WriteServ("462 %s :You may not reregister",user->nick);
+               user->WriteNumeric(462, "%s :You may not reregister", user->nick.c_str());
                return CMD_FAILURE;
        }