Do not send JOIN for zombies given ops or voice.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1607 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index 9dbdc70e1cd8698905efe22906642aea48ecab16..dcf5159fd06f76341c8354c8ec5dfc127d652f9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/channel.c (mode_process_clients): Do not reveal zombies who
+       are being opped (MODE and KICK crossed).  Reported by coekie.
+
 2006-01-06  Michael Poole <mdpoole@troilus.org>
 
        * ircd/m_join.c (ms_join): Wipe out all modes (not just chanops)

diff --git a/ircd/channel.c b/ircd/channel.c
index 61b8896c9fe51ef21cee5f71f2d3110903c24092..99e5182e6df59427cf825313573f17bb60915c23 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3085,7 +3085,7 @@ mode_process_clients(struct ParseState *state)
     /* actually effect the change */
     if (state->flags & MODE_PARSE_SET) {
       if (state->cli_change[i].flag & MODE_ADD) {
-        if (IsDelayedJoin(member))
+        if (IsDelayedJoin(member) && !IsZombie(member))
           RevealDelayedJoin(member);
        member->status |= (state->cli_change[i].flag &
                           (MODE_CHANOP | MODE_VOICE));