From 5ea98c7a832ebbd3bf3ac0c18f1ddcb98e16db7f Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Wed, 28 Mar 2007 07:45:46 -0700
Subject: [PATCH] [svn] Merge old trunk r2695: Send an SQUIT instead of an
 ERROR to announce /die to connected servers. This will generate better server
 notices.

---
 ChangeLog            | 10 ++++++++++
 include/serno.h      |  2 +-
 modules/core/m_die.c |  9 +++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a03d9313..18b83c662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+jilles      2007/03/28 14:33:50 UTC	(20070328-3293)
+  Log:
+  Merge old trunk r2294:
+  Zero out the varlist passed to substitution_* when rejecting DNSBL clients.
+  
+
+  Changes:	Modified:
+  +1 -1		trunk/src/s_user.c (File Modified) 
+
+
 jilles      2007/03/28 14:30:10 UTC	(20070328-3291)
   Log:
   Merge old trunk r2226:
diff --git a/include/serno.h b/include/serno.h
index fab296b32..f8a54722c 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070328-3291"
+#define SERNO "20070328-3293"
diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index 3c2c7a16e..3300c9f92 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_die.c 3161 2007-01-25 07:23:01Z nenolod $
+ *  $Id: m_die.c 3295 2007-03-28 14:45:46Z jilles $
  */
 
 #include "stdinc.h"
@@ -48,7 +48,7 @@ static struct Message die_msgtab = {
 
 mapi_clist_av1 die_clist[] = { &die_msgtab, NULL };
 
-DECLARE_MODULE_AV1(die, NULL, NULL, die_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV1(die, NULL, NULL, die_clist, NULL, NULL, "$Revision: 3295 $");
 
 /*
  * mo_die - DIE command handler
@@ -87,8 +87,9 @@ mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, cons
 	{
 		target_p = ptr->data;
 
-		sendto_one(target_p, ":%s ERROR :Terminated by %s",
-			   me.name, get_client_name(source_p, HIDE_IP));
+		sendto_one(target_p, "SQUIT %s :Terminated by %s",
+			   use_id(target_p),
+			   get_client_name(source_p, HIDE_IP));
 	}
 
 	/*