From 452f4d4bcc67bc8415b3eb26a86edd47192e55f4 Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Sat, 14 Apr 2007 14:53:28 -0700
Subject: [PATCH] [svn] Use TS6 prefix for server-server JOIN 0.

---
 ChangeLog             | 9 +++++++++
 include/serno.h       | 2 +-
 modules/core/m_join.c | 7 ++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 328821d..c4b6e85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+jilles      2007/04/14 20:58:56 UTC	(20070414-3408)
+  Log:
+  Use orighost in kill server notices.
+  
+
+  Changes:	Modified:
+  +3 -3		trunk/modules/core/m_kill.c (File Modified) 
+
+
 jilles      2007/04/13 19:06:53 UTC	(20070413-3406)
   Log:
   set: Use sendto_one_notice() for MAXCLIENTS too high notice.
diff --git a/include/serno.h b/include/serno.h
index ce5dfa0..6b1db35 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070413-3406"
+#define SERNO "20070414-3408"
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 6525064..cadfa6f 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_join.c 3211 2007-02-20 00:34:28Z jilles $
+ *  $Id: m_join.c 3410 2007-04-14 21:53:28Z jilles $
  */
 
 #include "stdinc.h"
@@ -62,7 +62,7 @@ mapi_hlist_av1 join_hlist[] = {
 	{ NULL, NULL },
 };
 
-DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3211 $");
+DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3410 $");
 
 static void do_join_0(struct Client *client_p, struct Client *source_p);
 static int check_channel_name_loc(struct Client *source_p, const char *name);
@@ -536,7 +536,8 @@ do_join_0(struct Client *client_p, struct Client *source_p)
 		flood_endgrace(source_p);
 
 
-	sendto_server(client_p, NULL, NOCAPS, NOCAPS, ":%s JOIN 0", source_p->name);
+	sendto_server(client_p, NULL, CAP_TS6, NOCAPS, ":%s JOIN 0", use_id(source_p));
+	sendto_server(client_p, NULL, NOCAPS, CAP_TS6, ":%s JOIN 0", source_p->name);
 
 	if(source_p->user->channel.head && MyConnect(source_p) &&
 	   !IsOper(source_p) && !IsExemptSpambot(source_p))