X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..b0e752b0f9572d4bdef62db949359a58a568d6f5:/modules/core/m_kill.c

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 5a07abf..80df7df 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -21,7 +21,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_kill.c 2755 2006-11-10 19:08:03Z jilles $
  */
 
 #include "stdinc.h"
@@ -29,13 +28,12 @@
 #include "hash.h"		/* for find_client() */
 #include "ircd.h"
 #include "numeric.h"
-#include "sprintf_irc.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
@@ -55,11 +53,10 @@ struct Message kill_msgtab = {
 
 mapi_clist_av1 kill_clist[] = { &kill_msgtab, NULL };
 
-DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, NULL, NULL, "$Revision: 2755 $");
+DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, NULL, NULL, "$Revision: 3408 $");
 
 /*
 ** mo_kill
-**      parv[0] = sender prefix
 **      parv[1] = kill victim
 **      parv[2] = kill path
 */
@@ -106,14 +103,14 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 						   form_str(ERR_NOSUCHNICK), user);
 			return 0;
 		}
-		sendto_one(source_p, ":%s NOTICE %s :KILL changed from %s to %s",
-			   me.name, parv[0], user, target_p->name);
+		sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
 	}
 
 	if(!MyConnect(target_p) && (!IsOperGlobalKill(source_p)))
 	{
-		sendto_one(source_p, ":%s NOTICE %s :Nick %s isnt on your server",
-			   me.name, parv[0], target_p->name);
+		sendto_one_notice(source_p, ":Nick %s is not on your server "
+				            "and you do not have the global_kill flag",
+				target_p->name);
 		return 0;
 	}
 
@@ -125,12 +122,13 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* Do not change the format of this message.  There's no point in changing messages
 	 * that have been around for ever, for no reason.. */
 	sendto_realops_snomask(SNO_GENERAL, L_ALL,
-			     "Received KILL message for %s. From %s Path: %s (%s)",
-			     target_p->name, parv[0], me.name, reason);
+			     "Received KILL message for %s!%s@%s. From %s Path: %s (%s)",
+			     target_p->name, target_p->username, target_p->orighost, 
+			     source_p->name, me.name, reason);
 
 	ilog(L_KILL, "%c %s %s!%s@%s %s %s",
 	     MyConnect(target_p) ? 'L' : 'G', get_oper_name(source_p),
-	     target_p->name, target_p->username, target_p->host, target_p->user->server, reason);
+	     target_p->name, target_p->username, target_p->host, target_p->servptr->name, reason);
 
 	/*
 	 ** And pass on the message to other servers. Note, that if KILL
@@ -149,7 +147,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 		target_p->flags |= FLAGS_KILLED;
 	}
 
-	ircsprintf(buf, "Killed (%s (%s))", source_p->name, reason);
+	rb_sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
 
 	exit_client(client_p, target_p, source_p, buf);
 
@@ -158,7 +156,6 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 /*
  * ms_kill
- *      parv[0] = sender prefix
  *      parv[1] = kill victim
  *      parv[2] = kill path and reason
  */
@@ -244,24 +241,26 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 	if(IsOper(source_p))	/* send it normally */
 	{
 		sendto_realops_snomask(IsService(source_p) ? SNO_SKILL : SNO_GENERAL, L_ALL,
-				     "Received KILL message for %s. From %s Path: %s!%s!%s!%s %s",
-				     target_p->name, parv[0], source_p->user->server,
-				     source_p->host, source_p->username, source_p->name, reason);
+				     "Received KILL message for %s!%s@%s. From %s Path: %s!%s!%s!%s %s",
+				     target_p->name, target_p->username, target_p->orighost, source_p->name, 
+				     source_p->servptr->name, source_p->host, source_p->username,
+				     source_p->name, reason);
 
 		ilog(L_KILL, "%c %s %s!%s@%s %s %s",
 		     MyConnect(target_p) ? 'O' : 'R', get_oper_name(source_p),
 		     target_p->name, target_p->username, target_p->host,
-		     target_p->user->server, reason);
+		     target_p->servptr->name, reason);
 	}
 	else
 	{
 		sendto_realops_snomask(SNO_SKILL, L_ALL,
-				     "Received KILL message for %s. From %s %s",
-				     target_p->name, parv[0], reason);
+				     "Received KILL message for %s!%s@%s. From %s %s",
+				     target_p->name, target_p->username, target_p->orighost,
+				     source_p->name, reason);
 
 		ilog(L_KILL, "S %s %s!%s@%s %s %s",
 		     source_p->name, target_p->name, target_p->username,
-		     target_p->host, target_p->user->server, reason);
+		     target_p->host, target_p->servptr->name, reason);
 	}
 
 	relay_kill(client_p, source_p, target_p, path, reason);
@@ -269,7 +268,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 	/* FLAGS_KILLED prevents a quit being sent out */
 	target_p->flags |= FLAGS_KILLED;
 
-	ircsprintf(buf, "Killed (%s %s)", source_p->name, reason);
+	rb_sprintf(buf, "Killed (%s %s)", source_p->name, reason);
 
 	exit_client(client_p, target_p, source_p, buf);
 
@@ -281,17 +280,17 @@ relay_kill(struct Client *one, struct Client *source_p,
 	   struct Client *target_p, const char *inpath, const char *reason)
 {
 	struct Client *client_p;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 	char buffer[BUFSIZE];
 
 	if(MyClient(source_p))
-		ircsnprintf(buffer, sizeof(buffer),
+		rb_snprintf(buffer, sizeof(buffer),
 			    "%s!%s!%s!%s (%s)",
 			    me.name, source_p->host, source_p->username, source_p->name, reason);
 	else
-		ircsnprintf(buffer, sizeof(buffer), "%s %s", inpath, reason);
+		rb_snprintf(buffer, sizeof(buffer), "%s %s", inpath, reason);
 
-	DLINK_FOREACH(ptr, serv_list.head)
+	RB_DLINK_FOREACH(ptr, serv_list.head)
 	{
 		client_p = ptr->data;