[svn] Backport from early 3.x:
-- nenolod 2006/09/27 16:39:14 UTC (20060927-2178) Log: - remove "Processing connection to foobar.net" message Changes: Modified: +0 -3 trunk/src/s_auth.c (File Modified) nenolod 2006/09/27 16:34:26 UTC (20060927-2176) Log: - missed the processing connection one (actually, we can probably nuke this one) Changes: Modified: +1 -2 trunk/src/s_auth.c (File Modified) river 2006/09/27 16:33:05 UTC (20060927-2174) Log: get_client_name = stupid Changes: Modified: +10 -7 trunk/modules/core/m_kill.c (File Modified) nenolod 2006/09/27 16:32:37 UTC (20060927-2172) Log: - remove excessive arguments Changes: Modified: +1 -2 trunk/src/s_conf.c (File Modified) +1 -1 trunk/src/s_user.c (File Modified) nenolod 2006/09/27 16:30:59 UTC (20060927-2170) Log: - use sendto_one_notice() for on-connect notices too. Changes: Modified: +10 -10 trunk/src/s_auth.c (File Modified) nenolod 2006/09/27 16:27:01 UTC (20060927-2168) Log: - use sendto_one_notice() in the core, too. Changes: Modified: +2 -2 trunk/src/chmode.c (File Modified) +8 -15 trunk/src/modules.c (File Modified) +3 -5 trunk/src/s_conf.c (File Modified) +1 -2 trunk/src/s_newconf.c (File Modified) +20 -57 trunk/src/s_user.c (File Modified) river 2006/09/27 16:19:25 UTC (20060927-2166) Log: the KILL command will use get_client_name(, SHOW_IP) instead of target->name, and will show a more useful error for local opers Changes: Modified: +6 -4 trunk/modules/core/m_kill.c (File Modified) nenolod 2006/09/27 16:09:48 UTC (20060927-2164) Log: - fix bugs in sendto_one_notice()/sendto_one_numeric() where a client identifier won't be sent to unregistered clients Changes: Modified: +4 -2 trunk/src/send.c (File Modified) nenolod 2006/09/27 16:05:46 UTC (20060927-2161) Log: - back out r2159 Changes: Modified: +1 -1 trunk/include/client.h (File Modified) nenolod 2006/09/27 16:04:05 UTC (20060927-2159) Log: - get_id(): fall back to "*" if client has no known name Changes: Modified: +1 -1 trunk/include/client.h (File Modified) nenolod 2006/09/27 16:01:29 UTC (20060927-2157) Log: - convert to sendto_one_notice(). Changes: Modified: +2 -3 trunk/unsupported/m_clearchan.c (File Modified) +4 -6 trunk/unsupported/m_force.c (File Modified) nenolod 2006/09/27 15:57:11 UTC (20060927-2155) Log: - use sendto_one_notice() in many places instead of sendto_one(source_p, ":%s NOTICE %s :", ...); Changes: Modified: +10 -25 trunk/extensions/example_module.c (File Modified) +5 -14 trunk/extensions/hurt.c (File Modified) +1 -2 trunk/extensions/m_42.c (File Modified) +7 -12 trunk/extensions/m_mkpasswd.c (File Modified) +1 -2 trunk/extensions/m_ojoin.c (File Modified) +1 -2 trunk/extensions/m_opme.c (File Modified) +3 -3 trunk/extensions/spy_whois_notice.c (File Modified) +3 -3 trunk/extensions/spy_whois_notice_global.c (File Modified) +3 -7 trunk/modules/core/m_die.c (File Modified) +2 -4 trunk/modules/core/m_kill.c (File Modified) +2 -2 trunk/modules/core/m_squit.c (File Modified) +1 -2 trunk/modules/m_challenge.c (File Modified) +11 -15 trunk/modules/m_connect.c (File Modified) +20 -28 trunk/modules/m_dline.c (File Modified) +2 -2 trunk/modules/m_etrace.c (File Modified) +11 -21 trunk/modules/m_gline.c (File Modified) +2 -4 trunk/modules/m_kline.c (File Modified) +1 -2 trunk/modules/m_rehash.c (File Modified) +3 -7 trunk/modules/m_restart.c (File Modified) +31 -45 trunk/modules/m_set.c (File Modified) +2 -4 trunk/modules/m_testmask.c (File Modified) +5 -8 trunk/modules/m_unreject.c (File Modified) +2 -5 trunk/modules/m_xline.c (File Modified) --
This commit is contained in:
parent
92fb5c3175
commit
5366977b4f
35 changed files with 251 additions and 365 deletions
|
@ -21,7 +21,7 @@
|
|||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA
|
||||
*
|
||||
* $Id: m_kill.c 2755 2006-11-10 19:08:03Z jilles $
|
||||
* $Id: m_kill.c 3161 2007-01-25 07:23:01Z nenolod $
|
||||
*/
|
||||
|
||||
#include "stdinc.h"
|
||||
|
@ -55,7 +55,7 @@ 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: 3161 $");
|
||||
|
||||
/*
|
||||
** mo_kill
|
||||
|
@ -106,14 +106,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,8 +125,9 @@ 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->host,
|
||||
parv[0], me.name, reason);
|
||||
|
||||
ilog(L_KILL, "%c %s %s!%s@%s %s %s",
|
||||
MyConnect(target_p) ? 'L' : 'G', get_oper_name(source_p),
|
||||
|
@ -244,9 +245,10 @@ 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->host, parv[0],
|
||||
source_p->user->server, 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),
|
||||
|
@ -256,8 +258,9 @@ ms_kill(struct Client *client_p, struct Client *source_p, int parc, const char *
|
|||
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->host,
|
||||
parv[0], reason);
|
||||
|
||||
ilog(L_KILL, "S %s %s!%s@%s %s %s",
|
||||
source_p->name, target_p->name, target_p->username,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue