From 6f7a78f6aa53d9096bdcde9c6044a6527c64a3ae Mon Sep 17 00:00:00 2001 From: JD Horelick Date: Sun, 21 Mar 2010 03:43:25 -0400 Subject: [PATCH] Added check for flood settings in m_message. Why was this not here before? What good are flood settings really if they're not applied to messages? --- modules/core/m_message.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/m_message.c b/modules/core/m_message.c index 29c4b44..6e8ba99 100644 --- a/modules/core/m_message.c +++ b/modules/core/m_message.c @@ -887,7 +887,7 @@ flood_attack_client(int p_or_n, struct Client *source_p, struct Client *target_p * and msg user@server. * -- jilles */ - if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p)) + if(GlobalSetOptions.floodcount && IsClient(source_p) && source_p != target_p && !IsService(target_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood)) { if((target_p->first_received_message_time + 1) < rb_current_time()) { @@ -942,7 +942,7 @@ flood_attack_channel(int p_or_n, struct Client *source_p, struct Channel *chptr, { int delta; - if(GlobalSetOptions.floodcount && MyClient(source_p)) + if(GlobalSetOptions.floodcount && MyClient(source_p) && (!IsOper(source_p) || !ConfigFileEntry.true_no_oper_flood)) { if((chptr->first_received_message_time + 1) < rb_current_time()) {