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

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

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index e4acbbbf19e8e655ff05f338611a76f646500d00..c7524ab4a974113ea4e14def75b135d15c4fdfba 100644 (file)
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.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
@@ -23,35 +23,35 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
  */
 CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       char reason[MAXKICK];
+       std::string reason;
        Channel* c = ServerInstance->FindChan(parameters[0]);
        User* u = ServerInstance->FindNick(parameters[1]);
 
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, parameters.size(), 1))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
                return CMD_SUCCESS;
 
        if (!u || !c)
        {
-               user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0].c_str() : parameters[1].c_str());
+               user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), u ? parameters[0].c_str() : parameters[1].c_str());
                return CMD_FAILURE;
        }
 
        if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!ServerInstance->ULine(user->server)))
        {
-               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick, parameters[0].c_str());
+               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 
        if (parameters.size() > 2)
        {
-               strlcpy(reason, parameters[2].c_str(), MAXKICK - 1);
+               reason.assign(parameters[2], 0, ServerInstance->Config->Limits.MaxKick);
        }
        else
        {
-               strlcpy(reason, user->nick, MAXKICK - 1);
+               reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
        }
 
-       if (!c->KickUser(user, u, reason))
+       if (!c->KickUser(user, u, reason.c_str()))
                /* Nobody left here, delete the Channel */
                delete c;