Fix to give the proper target ip on connect, cookies to w00t and Jason

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

diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index 8a8dbb6ddb40b757b593ed1f703c014137aa331f..72e3ff17ea31ba9a257f5428e788f26eeb35ceb6 100644 (file)
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -94,7 +94,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
                        XLine* mq = ServerInstance->XLines->MatchesLine("Q",parameters[0]);
                        if (mq)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0].c_str(), user->nick.c_str(), user->ident.c_str(), user->host, mq->reason);
+                               ServerInstance->SNO->WriteToSnoMask('x', "Q-Lined nickname %s from %s!%s@%s: %s", parameters[0].c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), mq->reason);
                                user->WriteNumeric(432, "%s %s :Invalid nickname: %s",user->nick.c_str(), parameters[0].c_str(), mq->reason);
                                return CMD_FAILURE;
                        }
@@ -149,11 +149,8 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        /* actually change the nick within the record */
        if (!user)
                return CMD_FAILURE;
-       if (!user->nick.empty())
-               return CMD_FAILURE;
 
        user->nick.assign(parameters[0], 0, NICKMAX - 1);
-
        user->InvalidateCache();
 
        /* Update display nicks */