summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-09-25 00:10:00 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-09-25 00:10:00 +0000
commitedf061fc6a7259f84a4e3be6f43c9e0601b3b39d (patch)
treeb7b04757f13add7011209a049199c7a4074b1b10 /src
parent053490d8850b2e67e47aa278e64c3a6263032ea4 (diff)
The only solution is to hide the killing oper even from other opers, and make them read the snomasks. You cant have it both ways, if you want to hide stuff, you HIDE it. Deal with it.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8075 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/cmd_kill.cpp14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index 1d58ea419..43cf1d5ab 100644
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -29,7 +29,6 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
userrec *u = ServerInstance->FindNick(parameters[0]);
char killreason[MAXBUF];
- char killoperreason[MAXBUF];
int MOD_RESULT = 0;
if (u)
@@ -62,18 +61,11 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
// hidekills is off, do nothing
snprintf(killreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
}
-
- // opers are lucky ducks, they always see the real reason
- snprintf(killoperreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
}
else
{
+ /* Leave it alone, remote server has already formatted it */
snprintf(killreason, MAXQUIT, "%s", parameters[1]);
- /*
- * XXX - yes, this means opers will probably see a censored kill remotely. this needs fixing.
- * maybe a version of QuitUser that doesn't take nor propegate an oper reason? -- w00t
- */
- snprintf(killoperreason, MAXQUIT, "%s", parameters[1]);
}
/*
@@ -84,7 +76,7 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
{
// remote kill
ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
- FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason, killoperreason));
+ FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason, killreason));
}
else
{
@@ -111,7 +103,7 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
}
// send the quit out
- userrec::QuitUser(ServerInstance, u, killreason, killoperreason);
+ userrec::QuitUser(ServerInstance, u, killreason);
}
else
{