Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-07-27 21:37:53 UTC
Modified files:
ircd/m_burst.c
Log message:
clarify code and comment for previous net rider kick change
---------------------- diff included ----------------------
Index: ircu2.10/ircd/m_burst.c
diff -u ircu2.10/ircd/m_burst.c:1.23 ircu2.10/ircd/m_burst.c:1.24
--- ircu2.10/ircd/m_burst.c:1.23 Tue Jul 27 08:06:09 2004
+++ ircu2.10/ircd/m_burst.c Tue Jul 27 14:37:42 2004
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_burst.c,v 1.23 2004/07/27 15:06:09 entrope Exp $
+ * $Id: m_burst.c,v 1.24 2004/07/27 21:37:42 entrope Exp $
*/
/*
@@ -240,10 +240,13 @@
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);
----------------------- End of diff -----------------------
