keep in sync with OGN upstream (SVN-317)

[ircu2.10.12-pk.git] / ircd / s_err.c

diff --git a/ircd/s_err.c b/ircd/s_err.c
index e08877159db2a738458e4c3025a300e2f0566192..ede3c24b74119f2d5cfc2bb45e0b964eb15da886 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -826,7 +826,7 @@ static Numeric replyTable[] = {
 /* 396 */
   { RPL_HOSTHIDDEN, "%s :is now your hidden host", "396" },
 /* 397 */
-  { RPL_HOSTIDENTHIDDEN, "%s@%s :is now your hidden username@host", "397" },
+  { RPL_HOSTUSERHIDDEN, "%s@%s :is now your hidden username@host", "397" },
 /* 398 */
   { 0 },
 /* 399 */
@@ -972,21 +972,21 @@ static Numeric replyTable[] = {
 /* 469 */
   { 0 },
 /* 470 */
-  { ERR_JOINACCESS, "%s :Cannot join channel (+a)", "470" },
+  { ERR_JOINACCESS, "%s :%s", "470" },
 /* 471 */
-  { ERR_CHANNELISFULL, "%s :Cannot join channel (+l)", "471" },
+  { ERR_CHANNELISFULL, "%s :%s", "471" },
 /* 472 */
   { ERR_UNKNOWNMODE, "%c :is unknown mode char to me", "472" },
 /* 473 */
-  { ERR_INVITEONLYCHAN, "%s :Cannot join channel (+i)", "473" },
+  { ERR_INVITEONLYCHAN, "%s :%s", "473" },
 /* 474 */
-  { ERR_BANNEDFROMCHAN, "%s :Cannot join channel (+b)", "474" },
+  { ERR_BANNEDFROMCHAN, "%s :%s", "474" },
 /* 475 */
-  { ERR_BADCHANNELKEY, "%s :Cannot join channel (+k)", "475" },
+  { ERR_BADCHANNELKEY, "%s :%s", "475" },
 /* 476 */
   { ERR_BADCHANMASK, "%s :Bad Channel Mask", "476" },
 /* 477 */
-  { ERR_NEEDREGGEDNICK, "%s :Cannot join channel (+r): this channel requires authentication -- you can obtain an account from %s", "477" },
+  { ERR_NEEDREGGEDNICK, "%s :%s", "477" },
 /* 478 */
   { ERR_BANLISTFULL, "%s %s :Channel ban/ignore list is full", "478" },
 /* 479 */