From 64a7ec5dcf5a0bb0f76df3d36f57d798822bd6d0 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Tue, 27 Jul 2004 21:37:42 +0000 Subject: [PATCH] clarify code and comment for previous net rider kick change git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1090 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ircd/m_burst.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ircd/m_burst.c b/ircd/m_burst.c index 55e628e..f282ba9 100644 --- a/ircd/m_burst.c +++ b/ircd/m_burst.c @@ -240,10 +240,13 @@ int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) nmember = member->next_member; if (!MyUser(member->user) || IsZombie(member)) continue; - /* Kick as netrider if key mismatch *or* remote channel is +i - * *or* remote channel is +r and user has no account. + /* Kick as netrider if key mismatch *or* remote channel is + * +i (unless user is an oper) *or* remote channel is +r + * (unless user has an account). */ - if ((check_modes == MODE_REGONLY) && IsAccount(member->user)) + if (!(check_modes & MODE_KEY) + && (!(check_modes & MODE_INVITEONLY) || IsAnOper(member->user)) + && (!(check_modes & MODE_REGONLY) || IsAccount(member->user))) continue; sendcmdto_serv_butone(&me, CMD_KICK, NULL, "%H %C :Net Rider", chptr, member->user); sendcmdto_channel_butserv_butone(&me, CMD_KICK, chptr, NULL, 0, "%H %C :Net Rider", chptr, member->user); -- 2.20.1