Move RPL_SYNTAX to 650 to prevent a collision with RPL_TEXT.

Also move the command name to a parameter so that it is more easily
parseable by software.

diff --git a/include/numerics.h b/include/numerics.h
index a105b970e1fd19e5850e17b51f7d7f0732b98e24..2dc8d841489651d35c514740c81762e4ae01e9d8 100644 (file)
--- a/include/numerics.h
+++ b/include/numerics.h
@@ -73,7 +73,6 @@ enum
        RPL_AWAY                        = 301,
        RPL_USERHOST                    = 302,
        RPL_ISON                        = 303,
-       RPL_SYNTAX                      = 304, // insp-specific
 
        RPL_UNAWAY                      = 305,
        RPL_NOWAWAY                     = 306,
@@ -187,6 +186,8 @@ enum
        ERR_CANTJOINOPERSONLY           = 520, // unrealircd, but crap to have so many numerics for cant join..
        ERR_CANTSENDTOUSER              = 531, // ???
 
+       RPL_SYNTAX                      = 650, // insp-specific
+
        ERR_CHANOPEN                    = 713,
        ERR_KNOCKONCHAN                 = 714,
 

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index f3511b05b0c7c36aa4c0f41ffea961e7056b54a2..9ffd20865236e1b7874f211fef472367958a2d86 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -307,7 +307,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                user->CommandFloodPenalty += failpenalty;
                user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters.");
                if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length()))
-                       user->WriteNumeric(RPL_SYNTAX, InspIRCd::Format("SYNTAX %s %s", handler->name.c_str(), handler->syntax.c_str()));
+                       user->WriteNumeric(RPL_SYNTAX, handler->name, handler->syntax);
                return;
        }