From dd2bf9e926860657dee2ddf19623987a5245b32c Mon Sep 17 00:00:00 2001
From: codemastr <devnull@localhost>
Date: Tue, 26 Nov 2002 23:07:13 +0000
Subject: [PATCH] Fixed a bug where chmode +q users could not kick chmode +a
 users

---
 Changes       | 2 ++
 src/channel.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index d4d196d3c..a72ec888c 100644
--- a/Changes
+++ b/Changes
@@ -1683,3 +1683,5 @@ seen. gmtime warning still there
   need to perform configuration tests. This is currently only implimented for dynamic linking
 - Made the same system work under static linking. This (barring any bugs) should be the
   completion of conf3. :)
+- Fixed a bug where chmode +q users could not kick chmode +a users. (#0000459) reported by
+  jollino.
diff --git a/src/channel.c b/src/channel.c
index 4ffcc9e48..843378762 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -3463,9 +3463,9 @@ CMD_FUNC(m_kick)
 						    chptr->chname, who->name, comment);
 						goto attack;
 					}	/* is_chan_op */
-				if (is_chanprot(who, chptr)
+				if ((is_chanprot(who, chptr)
 				    || is_chanowner(who, chptr)
-				    || IsServices(who)) {
+				    || IsServices(who)) && !is_chanowner(sptr, chptr)) {
 					if (IsNetAdmin(sptr))
 					{	/* IRCop kicking owner/prot */
 						sendto_snomask(SNO_EYES,