diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/m_join.c | 2 | ||||
| -rw-r--r-- | modules/core/m_kick.c | 6 | ||||
| -rw-r--r-- | modules/m_invite.c | 2 | ||||
| -rw-r--r-- | modules/m_topic.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/core/m_join.c b/modules/core/m_join.c index 673e88c..5c9ba9a 100644 --- a/modules/core/m_join.c +++ b/modules/core/m_join.c @@ -174,7 +174,7 @@ m_join(struct Client *client_p, struct Client *source_p, /* * can_join checks for +i key, bans. */ - if ((i = can_join(source_p, chptr, key))) + if ((i = can_join(source_p, chptr, key)) && !HasUMode(source_p, UMODE_GOD)) { sendto_one(source_p, form_str(i), me.name, source_p->name, chptr->chname); diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c index a9f012f..27818e5 100644 --- a/modules/core/m_kick.c +++ b/modules/core/m_kick.c @@ -97,7 +97,7 @@ m_kick(struct Client *client_p, struct Client *source_p, } } - if (!has_member_flags(ms_source, CHFL_CHANOP|CHFL_HALFOP) && !HasUMode(source_p, UMODE_GCHANOP)) + if (!has_member_flags(ms_source, CHFL_CHANOP|CHFL_HALFOP) && !HasUMode(source_p, UMODE_GOD)) { /* was a user, not a server, and user isn't seen as a chanop here */ if (MyConnect(source_p)) @@ -146,10 +146,10 @@ m_kick(struct Client *client_p, struct Client *source_p, { #ifdef HALFOPS /* half ops cannot kick other halfops on private channels */ - if (has_member_flags(ms_source, CHFL_HALFOP) && !has_member_flags(ms_source, CHFL_CHANOP) && !HasUMode(source_p, UMODE_GCHANOP)) + if (has_member_flags(ms_source, CHFL_HALFOP) && !has_member_flags(ms_source, CHFL_CHANOP) && !HasUMode(source_p, UMODE_GOD)) { if (((chptr->mode.mode & MODE_PRIVATE) && has_member_flags(ms_target, - CHFL_CHANOP|CHFL_HALFOP)) || has_member_flags(ms_target, CHFL_CHANOP) || HasUMode(who, UMODE_GCHANOP)) + CHFL_CHANOP|CHFL_HALFOP)) || has_member_flags(ms_target, CHFL_CHANOP) || HasUMode(target_p, UMODE_GOD)) { sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED), me.name, source_p->name, chptr->chname); diff --git a/modules/m_invite.c b/modules/m_invite.c index 48e86e6..ccca4dd 100644 --- a/modules/m_invite.c +++ b/modules/m_invite.c @@ -91,7 +91,7 @@ m_invite(struct Client *client_p, struct Client *source_p, } if (MyConnect(source_p) && !has_member_flags(ms, CHFL_CHANOP) - && !HasUMode(source_p, UMODE_GCHANOP)) + && !HasUMode(source_p, UMODE_GOD)) { sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED), me.name, source_p->name, chptr->chname); diff --git a/modules/m_topic.c b/modules/m_topic.c index 3aa5e3d..6d7e351 100644 --- a/modules/m_topic.c +++ b/modules/m_topic.c @@ -82,7 +82,7 @@ m_topic(struct Client *client_p, struct Client *source_p, if (!(chptr->mode.mode & MODE_TOPICLIMIT) || has_member_flags(ms, CHFL_CHANOP|CHFL_HALFOP) || - HasUMode(source_p, UMODE_GCHANOP)) + HasUMode(source_p, UMODE_GOD)) { char topic_info[USERHOST_REPLYLEN]; |