From 6a14bf789b4c56f17a6810a219b965b22298780a Mon Sep 17 00:00:00 2001 From: Ed Kellett Date: Wed, 8 Aug 2018 22:10:02 +0100 Subject: [PATCH] filter: kill last or we can't send the snote --- modules/filter.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/filter.c b/modules/filter.c index 1e828ced..ed302582 100644 --- a/modules/filter.c +++ b/modules/filter.c @@ -312,14 +312,14 @@ filter_msg_user(void *data_) if (r & ACT_DROP) { data->approved = 1; } - if (r & ACT_KILL) { - exit_client(NULL, s, s, "Excess flood"); - } if (MyClient(s) && r & ACT_ALARM) { - sendto_realops_snomask_from(SNO_GENERAL, L_ALL | L_NETWIDE, s->servptr, + sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, "FILTER: %s!%s@%s [%s]", s->name, s->username, s->host, s->sockhost); } + if (r & ACT_KILL) { + exit_client(NULL, s, s, "Excess flood"); + } } void @@ -345,14 +345,14 @@ filter_msg_channel(void *data_) if (r & ACT_DROP) { data->approved = 1; } - if (r & ACT_KILL) { - exit_client(NULL, s, s, "Excess flood"); - } if (MyClient(s) && r & ACT_ALARM) { - sendto_realops_snomask_from(SNO_GENERAL, L_ALL | L_NETWIDE, s->servptr, + sendto_realops_snomask(SNO_GENERAL, L_ALL | L_NETWIDE, "FILTER: %s!%s@%s [%s]", s->name, s->username, s->host, s->sockhost); } + if (r & ACT_KILL) { + exit_client(NULL, s, s, "Excess flood"); + } } void