From 490421c72d99123e1b9ae2538711d60444570fbe Mon Sep 17 00:00:00 2001
From: Matthew Mondor <mmondor@pulsar-zone.net>
Date: Sun, 8 Jun 2014 21:44:23 +0000
Subject: [PATCH] Replace 338 response by 378 which irssi supports for
 RPL_WHOISACTUALLY

---
 RUBIKS-CHANGES    | 2 ++
 include/numeric.h | 4 ++--
 src/s_err.c       | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/RUBIKS-CHANGES b/RUBIKS-CHANGES
index 5f5b547..489c728 100644
--- a/RUBIKS-CHANGES
+++ b/RUBIKS-CHANGES
@@ -13,6 +13,8 @@ rubiks-ircd-1-0-5
   refuse to use the old insecure SSLv2 protocol.
 - Only client SSL connections are supported, as before, but eventually it
   should be used for inter-server links as well.
+- Now issue a more common 378 response for RPL_WHOISACTUALLY so that irssi
+  can now display these properly, instead of our old 338 response.
 
 
 rubiks-ircd-1-0-4
diff --git a/include/numeric.h b/include/numeric.h
index cee6be6..2097ea0 100644
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -18,7 +18,7 @@
  *
  */
 
-/* $Id: numeric.h,v 1.3 2005/03/17 20:39:02 mmondor Exp $ */
+/* $Id: numeric.h,v 1.4 2014/06/08 21:44:18 mmondor Exp $ */
 
 
 #define	RPL_WELCOME          001
@@ -126,7 +126,6 @@
 #define RPL_COMMANDSYNTAX    334
 
 #define RPL_WHOISTEXT        337
-#define RPL_WHOISACTUALLY    338
 
 #define RPL_INVITING         341
 #define	RPL_SUMMONING        342
@@ -157,6 +156,7 @@
 #define	RPL_ENDOFINFO        374
 #define	RPL_MOTDSTART        375
 #define	RPL_ENDOFMOTD        376
+#define RPL_WHOISACTUALLY    378
 
 #define RPL_YOUREOPER        381
 #define RPL_REHASHING        382
diff --git a/src/s_err.c b/src/s_err.c
index e3f5e3a..e732e99 100644
--- a/src/s_err.c
+++ b/src/s_err.c
@@ -372,7 +372,7 @@ static char *replies[] =
     /* 335 */	                NULL,
     /* 336 */	                NULL,
     /* 337 RPL_WHOISTEXT*/	":%s 337 %s :%s",
-    /* 338 RPL_WHOISACTUALLY */	":%s 338 %s :%s is actually %s@%s [%s]",
+    /* 338 */			NULL,
     /* 339 */	                NULL,
     /* 340 */	                NULL,
     /* 341 RPL_INVITING */	":%s 341 %s %s %s",
@@ -422,7 +422,7 @@ static char *replies[] =
     /* 375 RPL_MOTDSTART */	":%s 375 %s :- %s Message of the Day - ",
     /* 376 RPL_ENDOFMOTD */	":%s 376 %s :End of /MOTD command.",
     /* 377 */	                NULL,
-    /* 378 */	                NULL,
+    /* 378 RPL_WHOISACTUALLY */	":%s 378 %s %s :is connecting from %s@%s [%s]",
     /* 379 */	                NULL,
     /* 380 */	                NULL,
     /* 381 RPL_YOUREOPER */	":%s 381 %s :You are now an IRC Operator",
-- 
2.9.0