Fix ERR_{SUMMON|USERS}DISABLED: don't repeat command name in reply

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index a248e8a69b106fc31bd72c0b08d4c7789b5d175f..93c43b75f14072b71aa17ef3843f3fdcee6b8c8a 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -648,10 +648,10 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
  * therefore answers with ERR_SUMMONDISABLED.
  */
 GLOBAL bool
-IRC_SUMMON(CLIENT * Client, REQUEST * Req)
+IRC_SUMMON(CLIENT * Client, UNUSED REQUEST * Req)
 {
        return IRC_WriteStrClient(Client, ERR_SUMMONDISABLED_MSG,
-                                 Client_ID(Client), Req->command);
+                                 Client_ID(Client));
 } /* IRC_SUMMON */
 
 
@@ -741,10 +741,10 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req)
  * See RFC 2812 section 4.6. As suggested there the command is disabled.
  */
 GLOBAL bool
-IRC_USERS(CLIENT * Client, REQUEST * Req)
+IRC_USERS(CLIENT * Client, UNUSED REQUEST * Req)
 {
        return IRC_WriteStrClient(Client, ERR_USERSDISABLED_MSG,
-                                 Client_ID(Client), Req->command);
+                                 Client_ID(Client));
 } /* IRC_USERS */
 
 

diff --git a/src/ngircd/messages.h b/src/ngircd/messages.h
index 26be69ab86d27072f5f64d200176bcd8b8a18282..340f5f40dc5f3d8aa4ea36f9544bb9dabe2bf2be 100644 (file)
--- a/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@ -114,8 +114,8 @@
 #define ERR_USERNOTINCHANNEL_MSG       "441 %s %s %s :They aren't on that channel"
 #define ERR_NOTONCHANNEL_MSG           "442 %s %s :You are not on that channel"
 #define ERR_USERONCHANNEL_MSG          "443 %s %s %s :is already on channel"
-#define ERR_SUMMONDISABLED_MSG         "445 %s %s :SUMMON has been disabled"
-#define ERR_USERSDISABLED_MSG          "446 %s %s :USERS has been disabled"
+#define ERR_SUMMONDISABLED_MSG         "445 %s :SUMMON has been disabled"
+#define ERR_USERSDISABLED_MSG          "446 %s :USERS has been disabled"
 #define ERR_NOTREGISTERED_MSG          "451 %s :Connection not registered"
 #define ERR_NOTREGISTEREDSERVER_MSG    "451 %s :Connection not registered as server link"
 #define ERR_NEEDMOREPARAMS_MSG         "461 %s %s :Syntax error"