diff options
| author | Alexander Barton <alex@barton.de> | 2012-01-22 15:41:21 +0100 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2012-01-22 15:42:11 +0100 |
| commit | 73781c1b381d6b15c3d3610392deed72737d766c (patch) | |
| tree | 1d021812a2c6a08af14ea7d2979c743adb2f3778 /src | |
| parent | f2fa1045e24f81e5c844dd50d6e299cb1ad9acb2 (diff) | |
| download | ngircd-73781c1b381d6b15c3d3610392deed72737d766c.tar.gz ngircd-73781c1b381d6b15c3d3610392deed72737d766c.zip | |
Fix ERR_{SUMMON|USERS}DISABLED: don't repeat command name in reply
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/irc-info.c | 8 | ||||
| -rw-r--r-- | src/ngircd/messages.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index a248e8a6..93c43b75 100644 --- 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 26be69ab..340f5f40 100644 --- 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" |