repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 10c7ba99e73b42ec8c4c191ccdae60bdd35bba7d:
path_to: 
revision_to: 

commit 10c7ba99e73b42ec8c4c191ccdae60bdd35bba7d
Author: LucentW 
Date:   Mon May 11 22:05:08 2015 +0200

    IRC operators w/OperCanMode can kick anyone

diff --git a/src/ngircd/channel.c b/src/ngircd/channel.c

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

-----END OF PAGE-----