summaryrefslogtreecommitdiff
path: root/src/mode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mode.cpp')
-rw-r--r--src/mode.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/mode.cpp b/src/mode.cpp
index 247ef2edd..3db2a4571 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -353,14 +353,21 @@ void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool server
* (e.g. are they a (half)op?
*/
- if (((!is_uline(user->server)) && (!servermode)) || (cstatus(user, targetchannel) < STATUS_HOP))
+ if (cstatus(user, targetchannel) < STATUS_HOP)
{
- /* Not enough permission:
- * NOT a uline and NOT a servermode,
- * OR, NOT halfop or above.
- */
- WriteServ(user->fd,"482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name);
- return;
+ /* We don't have halfop */
+ log(DEBUG,"The user is not a halfop or above, checking other reasons for being able to set the modes");
+
+ /* Are we a uline or is it a servermode? */
+ if ((!is_uline(user->server)) && (!servermode))
+ {
+ /* Not enough permission:
+ * NOT a uline and NOT a servermode,
+ * OR, NOT halfop or above.
+ */
+ WriteServ(user->fd,"482 %s %s :You're not a channel (half)operator",user->nick, targetchannel->name);
+ return;
+ }
}
}
else if (targetuser)