commit 2f8877ded4f0831a2f6033c589fcd36d9cecd0ba from: Alexander Barton date: Mon Jan 09 22:18:39 2012 UTC Return ERR_UNKNOWNMODE(472) for unknown channel modes The daemon reported ERR_UMODEUNKNOWNFLAG(501), which is wrong. commit - 4bff3daf92f59c61cb43995118875a33580b81e3 commit + 2f8877ded4f0831a2f6033c589fcd36d9cecd0ba blob - 0c63e7277b2fc3a6a2a172cc96fa07c9b9aa478d blob + 383c4dee288f5a96e3c0ae0b88855ac49e3d9fb7 --- src/ngircd/irc-mode.c +++ src/ngircd/irc-mode.c @@ -673,9 +673,9 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Ori set ? '+' : '-', *mode_ptr, Client_ID(Origin), Channel_Name(Channel)); connected = IRC_WriteStrClient(Origin, - ERR_UMODEUNKNOWNFLAG2_MSG, - Client_ID(Origin), - set ? '+' : '-', *mode_ptr); + ERR_UNKNOWNMODE_MSG, + Client_ID(Origin), *mode_ptr, + Channel_Name(Channel)); x[0] = '\0'; } else { Log(LOG_DEBUG, blob - f06cf86be3b582f5a0fa27715f0493544d553987 blob + 761e36df1dbcb07ddffcf0a91c61fdddd5ec64af --- src/ngircd/messages.h +++ src/ngircd/messages.h @@ -122,7 +122,7 @@ #define ERR_SECURECHANNEL_MSG "471 %s %s :Cannot join channel (+z)" #define ERR_OPONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+O)" #define ERR_REGONLYCHANNEL_MSG "471 %s %s :Cannot join channel (+R)" -#define ERR_UNKNOWNMODE_MSG "472 %s: %c :is unknown mode char for %s" +#define ERR_UNKNOWNMODE_MSG "472 %s %c :is unknown mode char for %s" #define ERR_INVITEONLYCHAN_MSG "473 %s %s :Cannot join channel (+i)" #define ERR_BANNEDFROMCHAN_MSG "474 %s %s :Cannot join channel (+b)" #define ERR_BADCHANNELKEY_MSG "475 %s %s :Cannot join channel (+k)"