From: Alexander Barton <alex@barton.de>
Date: Fri, 27 Mar 2015 23:05:39 +0000 (+0100)
Subject: User mode "C": Allow messages from servers, services, and IRC Ops
X-Git-Tag: rel-25-rc1~11
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;ds=sidebyside;h=refs%2Fheads%2FRelaxUserModeC;p=ngircd-alex.git

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!
---

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);