server: Remove code to send recursive QUITs/SQUITs for non-QS servers.

[solanum.git] / src / messages.tab

diff --git a/src/messages.tab b/src/messages.tab
index ca196302a4c5905c87c5c96d06e7f66376a8bca0..942f866453ee8fa37c6a9976d4732ad2ec05ddb3 100644 (file)
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -232,7 +232,7 @@ static  const char *  replies[] = {
 /* 209 RPL_TRACECLASS, */       "Class %s %d",
 /* 210 */       NULL,
 /* 211 RPL_STATSLINKINFO, */    NULL,
-/* 212 RPL_STATSCOMMANDS, */    "%s %u %u :%u",
+/* 212 RPL_STATSCOMMANDS, */    "%s %u %lu :%u",
 /* 213 RPL_STATSCLINE, */       "C %s %s %s %d %s",
 /* 214 RPL_STATSNLINE, */       NULL,
 /* 215 RPL_STATSILINE, */       "I %s %s %s@%s %d %s",
@@ -271,11 +271,11 @@ static  const char *  replies[] = {
 
 /* 248 RPL_STATSULINE, */       "U %s %s@%s %s",
 /* 249 RPL_STATSDEBUG */       NULL,
-/* 250 RPL_STATSCONN, */       ":Highest connection count: %d (%d clients) (%d connections received)",
+/* 250 RPL_STATSCONN, */       ":Highest connection count: %d (%d clients) (%lu connections received)",
 /* 251 RPL_LUSERCLIENT, */     ":There are %d users and %d invisible on %d servers",
 /* 252 RPL_LUSEROP, */          "%d :IRC Operators online",
 /* 253 RPL_LUSERUNKNOWN, */     "%d :unknown connection(s)",
-/* 254 RPL_LUSERCHANNELS, */    "%d :channels formed",
+/* 254 RPL_LUSERCHANNELS, */    "%lu :channels formed",
 /* 255 RPL_LUSERME, */          ":I have %d clients and %d servers",
 /* 256 RPL_ADMINME, */          ":Administrative info about %s",
 /* 257 RPL_ADMINLOC1, */        ":%s",
@@ -343,7 +343,7 @@ static  const char *  replies[] = {
 /* 319 RPL_WHOISCHANNELS, */    ":%s 319 %s %s :",
 /* 320 */      NULL,
 /* 321 RPL_LISTSTART, */        ":%s 321 %s Channel :Users  Name",
-/* 322 RPL_LIST, */             ":%s 322 %s %s %d :%s",
+/* 322 RPL_LIST, */             ":%s 322 %s %s%s %lu :%s",
 /* 323 RPL_LISTEND, */          ":%s 323 %s :End of /LIST",
 /* 324 RPL_CHANNELMODEIS, */    ":%s 324 %s %s %s",
 /* 325 RPL_CHANNELMLOCKIS, */   ":%s 325 %s %s %s :is the current channel mode-lock",
@@ -358,7 +358,7 @@ static  const char *  replies[] = {
 /* 334 */       NULL,
 /* 335 */       NULL,
 /* 336 */       NULL,
-/* 337 */       NULL,
+/* 337 RPL_WHOISTEXT, */       "%s :%s",
 /* 338 RPL_WHOISACTUALLY, */   "%s %s :actually using host",
 /* 339 */       NULL,
 /* 340 */       NULL,
@@ -372,7 +372,11 @@ static  const char *  replies[] = {
 /* 348 RPL_EXCEPTLIST */        ":%s 348 %s %s %s %s %lu",
 /* 349 RPL_ENDOFEXCEPTLIST */   ":%s 349 %s %s :End of Channel Exception List",
 /* 350 */       NULL,
+#ifndef CUSTOM_BRANDING
 /* 351 RPL_VERSION, */          "%s(%s). %s :%s TS%dow %s",
+#else
+/* 351 RPL_VERSION, */          "%s(%s, %s). %s :%s TS%dow %s",
+#endif
 /* 352 RPL_WHOREPLY, */         ":%s 352 %s %s %s %s %s %s %s :%d %s",
 /* 353 RPL_NAMREPLY, */         ":%s 353 %s %s %s :",
 /* 354 RPL_WHOSPCRPL */         NULL,
@@ -691,7 +695,7 @@ static  const char *  replies[] = {
 /* 667 */      NULL,
 /* 668 */      NULL,
 /* 669 */      NULL,
-/* 670 */      NULL,
+/* 670 RPL_STARTTLS, */                ":STARTTLS successful, proceed with TLS handshake",
 /* 671 RPL_WHOISSECURE, */     "%s :is using a secure connection",
 /* 672 */      NULL,
 /* 673 */      NULL,
@@ -712,7 +716,7 @@ static  const char *  replies[] = {
 /* 688 */      NULL,
 /* 689 */      NULL,
 /* 690 */      NULL,
-/* 691 */      NULL,
+/* 691 ERR_STARTTLS */         ":%s",
 /* 692 */      NULL,
 /* 693 */      NULL,
 /* 694 */      NULL,
@@ -764,7 +768,7 @@ static  const char *  replies[] = {
 /* 740 RPL_RSACHALLENGE2*/     ":%s 740 %s :%s",
 /* 741 RPL_ENDOFRSACHALLENGE2*/        ":%s 741 %s :End of CHALLENGE",
 /* 742 ERR_MLOCKRESTRICTED */  "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
-/* 743 */      NULL,
+/* 743 ERR_INVALIDBAN */       "%s %c %s :Invalid ban mask",
 /* 744 */      NULL,
 /* 745 */      NULL,
 /* 746 */      NULL,
@@ -929,7 +933,7 @@ static  const char *  replies[] = {
 /* 905 ERR_SASLTOOLONG */      ":%s 905 %s :SASL message too long",
 /* 906 ERR_SASLABORTED */      ":%s 906 %s :SASL authentication aborted",
 /* 907 ERR_SASLALREADY */      ":%s 907 %s :You have already completed SASL authentication",
-/* 908 */      NULL,
+/* 908 RPL_SASLMECHS */                ":%s 908 %s %s :are available SASL mechanisms",
 /* 909 */      NULL,
 /* 910 */      NULL,
 /* 911 */      NULL,