about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorLucentW <LucentW@users.noreply.github.com>2015-05-11 22:05:08 +0200
committerAlexander Barton <alex@barton.de>2015-05-16 20:48:37 +0200
commit5c48d7e9c7f0181772c14b133030a3c0e978fdc5 (patch)
treef7c35e3c4870ff3a9570da4b01872a55ae6786d5 /src
parent0f490b5caec3439a0e67aa989eea26b352770c94 (diff)
downloadngircd-5c48d7e9c7f0181772c14b133030a3c0e978fdc5.tar.gz
ngircd-5c48d7e9c7f0181772c14b133030a3c0e978fdc5.zip
IRC operators w/OperCanMode can kick anyone
Closes #202.

(cherry picked from commit 10c7ba99e73b42ec8c4c191ccdae60bdd35bba7d)
Diffstat (limited to 'src')
-rw-r--r--src/ngircd/channel.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c
index 6d8dde3e..e74cd6eb 100644
--- a/src/ngircd/channel.c
+++ b/src/ngircd/channel.c
@@ -359,6 +359,11 @@ Channel_Kick(CLIENT *Peer, CLIENT *Target, CLIENT *Origin, const char *Name,
 		    !Channel_UserHasMode(chan, Target, 'a') &&
 		    !Channel_UserHasMode(chan, Target, 'o'))
 			can_kick = true;
+		
+		/* IRC operators & IRCd with OperCanMode enabled
+		 * can kick anyways regardless of privilege */	
+		else if(Client_HasMode(Origin, 'o') && Conf_OperCanMode)
+		    can_kick = true;
 
 		if(!can_kick) {
 			IRC_WriteErrClient(Origin, ERR_CHANOPPRIVTOOLOW_MSG,