X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..8e2ebdb80add54d46c9f7f058ad469d70ddf9457:/modules/core/m_die.c

diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index 49f5bcf4..624fbc64 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -21,17 +21,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_die.c 98 2005-09-11 03:37:47Z nenolod $
+ *  $Id: m_die.c 3295 2007-03-28 14:45:46Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "ircd.h"
 #include "irc_string.h"
 #include "numeric.h"
-#include "commio.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_conf.h"
 #include "send.h"
 #include "msg.h"
@@ -48,7 +46,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: 98 $");
+DECLARE_MODULE_AV1(die, NULL, NULL, die_clist, NULL, NULL, "$Revision: 3295 $");
 
 /*
  * mo_die - DIE command handler
@@ -57,7 +55,7 @@ static int
 mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	if(!IsOperDie(source_p))
 	{
@@ -67,32 +65,29 @@ mo_die(struct Client *client_p __unused, struct Client *source_p, int parc, cons
 
 	if(parc < 2 || EmptyString(parv[1]))
 	{
-		sendto_one(source_p, ":%s NOTICE %s :Need server name /die %s",
-			   me.name, source_p->name, me.name);
+		sendto_one_notice(source_p, ":Need server name /die %s", me.name);
 		return 0;
 	}
 	else if(irccmp(parv[1], me.name))
 	{
-		sendto_one(source_p, ":%s NOTICE %s :Mismatch on /die %s",
-			   me.name, source_p->name, me.name);
+		sendto_one_notice(source_p, ":Mismatch on /die %s", me.name);
 		return 0;
 	}
 
-	DLINK_FOREACH(ptr, lclient_list.head)
+	RB_DLINK_FOREACH(ptr, lclient_list.head)
 	{
 		target_p = ptr->data;
 
-		sendto_one(target_p,
-			   ":%s NOTICE %s :Server Terminating. %s",
-			   me.name, target_p->name, get_client_name(source_p, HIDE_IP));
+		sendto_one_notice(target_p, ":Server Terminating. %s", get_client_name(source_p, HIDE_IP));
 	}
 
-	DLINK_FOREACH(ptr, serv_list.head)
+	RB_DLINK_FOREACH(ptr, serv_list.head)
 	{
 		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));
 	}
 
 	/*