X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/373a04393b9cb827e08ce0e2f28709e57ea22bac..7d84719d682b3ac00ae9fb46010e01bb77f711f6:/modules/core/m_kill.c

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 99bbf5e7..060310bc 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_kill.c 3408 2007-04-14 20:58:56Z jilles $
  */
 
 #include "stdinc.h"
@@ -40,16 +38,18 @@
 #include "modules.h"
 #include "s_newconf.h"
 
+static const char kill_desc[] = "Provides the KILL command to remove a user from the network";
+
 static int h_can_kill;
 static char buf[BUFSIZE];
 
-static int ms_kill(struct Client *, struct Client *, int, const char **);
-static int mo_kill(struct Client *, struct Client *, int, const char **);
+static void ms_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void mo_kill(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void relay_kill(struct Client *, struct Client *, struct Client *,
 		       const char *, const char *);
 
 struct Message kill_msgtab = {
-	"KILL", 0, 0, 0, MFLG_SLOW,
+	"KILL", 0, 0, 0, 0,
 	{mg_unreg, mg_not_oper, {ms_kill, 2}, {ms_kill, 2}, mg_ignore, {mo_kill, 2}}
 };
 
@@ -60,15 +60,15 @@ mapi_hlist_av1 kill_hlist[] = {
 	{ NULL, NULL},
 };
 
-DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, kill_hlist, NULL, "$Revision: 3408 $");
+DECLARE_MODULE_AV2(kill, NULL, NULL, kill_clist, kill_hlist, NULL, NULL, NULL, kill_desc);
 
 /*
 ** mo_kill
 **      parv[1] = kill victim
 **      parv[2] = kill path
 */
-static int
-mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 	const char *inpath = client_p->name;
@@ -78,10 +78,10 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	user = parv[1];
 
-	if(!IsOperLocalKill(source_p))
+	if(!IsOperKill(source_p))
 	{
-		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "local_kill");
-		return 0;
+		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kill");
+		return;
 	}
 
 	if(!EmptyString(parv[2]))
@@ -102,26 +102,18 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 		 ** rewrite the KILL for this new nickname--this keeps
 		 ** servers in synch when nick change and kill collide
 		 */
-		if((target_p = get_history(user, (long) KILLCHASETIMELIMIT)) == NULL)
+		if((target_p = whowas_get_history(user, (long) KILLCHASETIMELIMIT)) == NULL)
 		{
 			if (strchr(user, '.'))
 				sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
 			else
 				sendto_one_numeric(source_p, ERR_NOSUCHNICK,
 						   form_str(ERR_NOSUCHNICK), user);
-			return 0;
+			return;
 		}
 		sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
 	}
 
-	if(!MyConnect(target_p) && (!IsOperGlobalKill(source_p)))
-	{
-		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;
-	}
-
 	/* Last chance to stop the kill */
 	moduledata.client = source_p;
 	moduledata.target = target_p;
@@ -130,7 +122,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 
 	if (moduledata.approved == 0)
 		/* The callee should have sent a message. */
-		return 0;
+		return;
 
 	if(MyConnect(target_p))
 		sendto_one(target_p, ":%s!%s@%s KILL %s :%s",
@@ -141,7 +133,7 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 	 * that have been around for ever, for no reason.. */
 	sendto_realops_snomask(SNO_GENERAL, L_ALL,
 			     "Received KILL message for %s!%s@%s. From %s Path: %s (%s)",
-			     target_p->name, target_p->username, target_p->orighost, 
+			     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",
@@ -165,11 +157,9 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 		target_p->flags |= FLAGS_KILLED;
 	}
 
-	rb_sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
+	sprintf(buf, "Killed (%s (%s))", source_p->name, reason);
 
 	exit_client(client_p, target_p, source_p, buf);
-
-	return 0;
 }
 
 /*
@@ -177,8 +167,8 @@ mo_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
  *      parv[1] = kill victim
  *      parv[2] = kill path and reason
  */
-static int
-ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+ms_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Client *target_p;
 	const char *user;
@@ -217,15 +207,15 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 	if((target_p = find_person(user)) == NULL)
 	{
 		/*
-		 * If the user has recently changed nick, but only if its 
+		 * If the user has recently changed nick, but only if its
 		 * not an uid, automatically rewrite the KILL for this new nickname.
 		 * --this keeps servers in synch when nick change and kill collide
 		 */
-		if(IsDigit(*user) || (!(target_p = get_history(user, (long) KILLCHASETIMELIMIT))))
+		if(IsDigit(*user) || (!(target_p = whowas_get_history(user, (long) KILLCHASETIMELIMIT))))
 		{
 			sendto_one_numeric(source_p, ERR_NOSUCHNICK,
 					   form_str(ERR_NOSUCHNICK), IsDigit(*user) ? "*" : user);
-			return 0;
+			return;
 		}
 		sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
 	}
@@ -233,7 +223,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 	if(IsServer(target_p) || IsMe(target_p))
 	{
 		sendto_one_numeric(source_p, ERR_CANTKILLSERVER, form_str(ERR_CANTKILLSERVER));
-		return 0;
+		return;
 	}
 
 	if(MyConnect(target_p))
@@ -258,7 +248,7 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
 	{
 		sendto_realops_snomask(IsService(source_p) ? SNO_SKILL : SNO_GENERAL, L_ALL,
 				     "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, 
+				     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);
 
@@ -284,11 +274,9 @@ 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;
 
-	rb_sprintf(buf, "Killed (%s %s)", source_p->name, reason);
+	sprintf(buf, "Killed (%s %s)", source_p->name, reason);
 
 	exit_client(client_p, target_p, source_p, buf);
-
-	return 0;
 }
 
 static void
@@ -300,11 +288,11 @@ relay_kill(struct Client *one, struct Client *source_p,
 	char buffer[BUFSIZE];
 
 	if(MyClient(source_p))
-		rb_snprintf(buffer, sizeof(buffer),
+		snprintf(buffer, sizeof(buffer),
 			    "%s!%s!%s!%s (%s)",
 			    me.name, source_p->host, source_p->username, source_p->name, reason);
 	else
-		rb_snprintf(buffer, sizeof(buffer), "%s %s", inpath, reason);
+		snprintf(buffer, sizeof(buffer), "%s %s", inpath, reason);
 
 	RB_DLINK_FOREACH(ptr, serv_list.head)
 	{