From 03acae970df0ebe713a4be791e6c75915d34a365 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sat, 28 Mar 2015 00:05:39 +0100 Subject: [PATCH] User mode "C": Allow messages from servers, services, and IRC Ops Update user mode "C" handling ("Only users that share a channel are allowed to send messages") to behave like user mode "b" ("block private messages and notices") and therefore allow messages from servers, services, and IRC Operators, too. Change proposed by "wowaname" in #ngircd, thanks! --- src/ngircd/irc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index dc3b2f2e..12fd8214 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -694,7 +694,10 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) goto send_next_target; } - if (Client_HasMode(cl, 'C')) { + if (Client_HasMode(cl, 'C') && + !Client_HasMode(from, 'o') && + !(Client_Type(from) == CLIENT_SERVER) && + !(Client_Type(from) == CLIENT_SERVICE)) { cl2chan = Channel_FirstChannelOf(cl); while (cl2chan) { chan = Channel_GetChannel(cl2chan); -- 2.39.2