Disallow remote /MODULES for non-opers.

[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 5e600ad1ce676581c41c6f906772488b8ad90b88..26061490d8c1ecc7f04135c700fe87b9d417cabc 100644 (file)
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -21,7 +21,6 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
 
 /** Handle /NICK. These command handlers can be reloaded by the core,
  * and handle basic RFC1459 commands. Commands within modules work
@@ -59,7 +58,7 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
 
        if (newnick.empty())
        {
-               user->WriteNumeric(432, "%s * :Erroneous Nickname", oldnick.c_str());
+               user->WriteNumeric(ERR_ERRONEUSNICKNAME, "* :Erroneous Nickname");
                return CMD_FAILURE;
        }
 
@@ -67,9 +66,9 @@ CmdResult CommandNick::Handle (const std::vector<std::string>& parameters, User
        {
                newnick = user->uuid;
        }
-       else if (!ServerInstance->IsNick(newnick.c_str(), ServerInstance->Config->Limits.NickMax))
+       else if (!ServerInstance->IsNick(newnick))
        {
-               user->WriteNumeric(432, "%s %s :Erroneous Nickname", user->nick.c_str(),newnick.c_str());
+               user->WriteNumeric(ERR_ERRONEUSNICKNAME, "%s :Erroneous Nickname", newnick.c_str());
                return CMD_FAILURE;
        }