Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

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

diff --git a/src/commands/cmd_server.cpp b/src/commands/cmd_server.cpp
index c7b413406513561fed331baba3cc2a023d1aef21..811d59057507162559e76b6c449c5b83cc576f91 100644 (file)
--- a/src/commands/cmd_server.cpp
+++ b/src/commands/cmd_server.cpp
@@ -23,7 +23,13 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 CmdResult CommandServer::Handle (const std::vector<std::string>&, User *user)
 {
-       user->WriteNumeric(666, "%s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick.c_str());
-       ServerInstance->SNO->WriteToSnoMask('A', "WARNING: %s attempted to issue a SERVER command and is registered as a user!", user->nick.c_str());
+       if (user->registered == REG_ALL)
+       {
+               user->WriteNumeric(ERR_ALREADYREGISTERED, "%s :You are already registered. (Perhaps your IRC client does not have a /SERVER command).",user->nick.c_str());
+       }
+       else
+       {
+               user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have seperate ports from clients, change your config)",command.c_str());
+       }
        return CMD_FAILURE;
 }