summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-05-30 17:43:07 +0000
committermichael <michael@82007160-df01-0410-b94d-b575c5fd34c7>2014-05-30 17:43:07 +0000
commita9ffbf81ad7177fd032b585c9898a4b27377361b (patch)
tree3a70afff2708bc926744838a7f7be6e656540462
parent70536762f6d49857b7e12f0a51dea429be281def (diff)
- m_kick.c:m_kick(): channel halfops (%) may now no longer KICK other channel halfops
git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@3715 82007160-df01-0410-b94d-b575c5fd34c7
-rw-r--r--NEWS1
-rw-r--r--modules/core/m_kick.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 022ca0a..83354ec 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ o) Fixed bug where "STATS p" would show an invalid amount of irc-operators
in case there are +H opers
o) irc-operators may now no longer set a channel +O if they are only halfops (%)
o) Channel halfops (%) may now no longer (de)halfop other channel members
+o) Channel halfops (%) may now no longer KICK other channel halfops
-- Noteworthy changes in version 8.1.17 (2014-05-01)
diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index 3d9bfd5..888b7d8 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -148,8 +148,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
/* half ops cannot kick other halfops on private channels */
if (has_member_flags(ms_source, CHFL_HALFOP) && !has_member_flags(ms_source, CHFL_CHANOP))
{
- if (((chptr->mode.mode & MODE_PRIVATE) && has_member_flags(ms_target,
- CHFL_CHANOP|CHFL_HALFOP)) || has_member_flags(ms_target, CHFL_CHANOP))
+ if (has_member_flags(ms_target, CHFL_CHANOP|CHFL_HALFOP))
{
sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
me.name, source_p->name, chptr->chname);