Author: Kev <klmitch@mit.edu>

Log message:

removed a piece of dead code, completely reimplemented m_kick from scratch

Status: Debugged and tested
Testing needed: Brute-force everything over and over again

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

diff --git a/ChangeLog b/ChangeLog
index 8d20d5867f97bd09917d724712a09a656fd0dd3e..d5bb0e559745cc088c57c4bb871b65a538aef53a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-01  Kevin L. Mitchell  <klmitch@mit.edu>
+
+       * ircd/m_kick.c: Completely reimplement m_kick
+
+       * ircd/channel.c: send_user_joins removed; it was dead code,
+       anyway...
+
 2000-05-01  Perry Lorier <isomer@coders.net>
        * ircd/m_invite.c: Fix for the rest of m_invite.c, and again.
        * ircd/channels.c: My fix for the part problem.  Untested, probably
@@ -1053,7 +1060,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.123 2000-05-01 11:23:56 isomer Exp $
+# $Id: ChangeLog,v 1.124 2000-05-01 16:50:41 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/include/channel.h b/include/channel.h
index 7294cb4513de609f8fe6bf66117c0f6220603d92..3d2b7294f42b04bf42a1787d266b2d8589d2afce 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -344,7 +344,6 @@ extern void send_channel_modes(struct Client *cptr, struct Channel *chptr);
 extern char *pretty_mask(char *mask);
 extern void del_invite(struct Client *cptr, struct Channel *chptr);
 extern void list_next_channels(struct Client *cptr, int nr);
-extern void send_user_joins(struct Client *cptr, struct Client *user);
 
 extern void modebuf_init(struct ModeBuf *mbuf, struct Client *source,
                         struct Client *connect, struct Channel *chan,

diff --git a/ircd/channel.c b/ircd/channel.c
index e1ab4aec5f4f89c6a1bd0d1623b36a0769498f3d..d110fe0c0b23bcb579dfdebb2fd671ee1b44f112 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -2490,7 +2490,10 @@ void make_zombie(struct Membership* member, struct Client* who, struct Client* c
   if (channel_all_zombies(chptr))
     remove_user_from_channel(who, chptr);
 
+  /* XXX Can't actually call Debug here; if the channel is all zombies,
+   * chptr will no longer exist when we get here.
   Debug((DEBUG_INFO, "%s is now a zombie on %s", who->name, chptr->chname));
+  */
 }
 
 int number_of_zombies(struct Channel *chptr)
@@ -2506,61 +2509,6 @@ int number_of_zombies(struct Channel *chptr)
   return count;
 }
 
-/* XXX we can probably get rid of send_user_joins */
-void send_user_joins(struct Client *cptr, struct Client *user)
-{
-  struct Membership* chan;
-  struct Channel*    chptr;
-  int   cnt = 0;
-  int   len = 0;
-  int   clen;
-  char* mask;
-  char  buf[BUFSIZE];
-
-  *buf = ':';
-  strcpy(buf + 1, user->name);
-  strcat(buf, " JOIN ");
-  len = strlen(user->name) + 7;
-
-  for (chan = user->user->channel; chan; chan = chan->next_channel)
-  {
-    chptr = chan->channel;
-    assert(0 != chptr);
-
-    if ((mask = strchr(chptr->chname, ':')))
-      if (match(++mask, cptr->name))
-        continue;
-    if (*chptr->chname == '&')
-      continue;
-    if (IsZombie(chan))
-      continue;
-    clen = strlen(chptr->chname);
-    if (clen + 1 + len > BUFSIZE - 3)
-    {
-      if (cnt)
-      {
-        buf[len - 1] = '\0';
-        sendto_one(cptr, "%s", buf); /* XXX Possibly DEAD */
-      }
-      *buf = ':';
-      strcpy(buf + 1, user->name);
-      strcat(buf, " JOIN ");
-      len = strlen(user->name) + 7;
-      cnt = 0;
-    }
-    strcpy(buf + len, chptr->chname);
-    cnt++;
-    len += clen;
-    if (chan->next_channel)
-    {
-      len++;
-      strcat(buf, ",");
-    }
-  }
-  if (*buf && cnt)
-    sendto_one(cptr, "%s", buf); /* XXX Possibly DEAD */
-}
-
 /*
  * send_hack_notice()
  *
@@ -3905,8 +3853,12 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
        sendcmdto_one(jbuf->jb_source, CMD_PART, jbuf->jb_source,
                      (flags & CHFL_BANNED || !jbuf->jb_comment) ?
                      ":%H" : "%H :%s", chan, jbuf->jb_comment);
-       /* XXX: Shouldn't we send a PART here anyway? */
-
+      /* XXX: Shouldn't we send a PART here anyway? */
+      /* to users on the channel?  Why?  From their POV, the user isn't on
+       * the channel anymore anyway.  We don't send to servers until below,
+       * when we gang all the channel parts together.  Note that this is
+       * exactly the same logic, albeit somewhat more concise, as was in
+       * the original m_part.c */
     } else {
       /* Add user to channel */
       add_user_to_channel(chan, jbuf->jb_source, flags);

diff --git a/ircd/m_kick.c b/ircd/m_kick.c
index bde9a71bb22a5a833e71ab4827eecdd1dfdc6dab..f5a488a933d770e9333a27be74cec793b7547dcc 100644 (file)
--- a/ircd/m_kick.c
+++ b/ircd/m_kick.c
@@ -108,404 +108,136 @@
  * parv[2] = client to kick
  * parv[parc-1] = kick comment
  */
-int m_kick(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
+int m_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 {
-  struct Client*  who;
-  struct Channel* chptr;
-  struct Membership* member = 0;
-  char*           channel_name;
+  struct Client *who;
+  struct Channel *chptr;
+  struct Membership *member = 0;
+  char *name, *comment;
 
   sptr->flags &= ~FLAGS_TS8;
 
   if (parc < 3 || *parv[1] == '\0')
     return need_more_params(sptr, "KICK");
 
-  channel_name = parv[1];
+  name = parv[1];
 
-  if (IsLocalChannel(channel_name) && !MyUser(sptr))
-    return 0;
+  /* simple checks */
+  if (!(chptr = get_channel(sptr, name, CGT_NO_CREATE)))
+    return send_reply(sptr, ERR_NOSUCHCHANNEL, name);
 
-  if (IsModelessChannel(channel_name)) {
-    sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED), me.name, parv[0],
-               channel_name);
-    return 0;
-  }
+  if (!is_chan_op(sptr, chptr) || IsModelessChannel(name))
+    return send_reply(sptr, ERR_CHANOPRIVSNEEDED, name);
 
-  chptr = get_channel(sptr, channel_name, CGT_NO_CREATE);
-  if (!chptr) {
-    sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0], channel_name);
-    return 0;
-  }
+  if (!(who = find_chasing(sptr, parv[2], 0)))
+    return 0; /* find_chasing sends the reply for us */
 
-  if (!IsServer(cptr) && !is_chan_op(sptr, chptr)) {
-    sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-               me.name, parv[0], chptr->chname);
-    return 0;
-  }
-
-  if (MyUser(sptr)) {
-    if (!(who = find_chasing(sptr, parv[2], 0)))
-      return 0;                 /* No such user left! */
-  }
-  else if (!(who = findNUser(parv[2])))
-    return 0;                   /* No such user left! */
-
-  /*
-   * if the user is +k, prevent a kick from local user
-   */
-  if (IsChannelService(who) && MyUser(sptr)) {
-    sendto_one(sptr, err_str(ERR_ISCHANSERVICE), me.name,
-        parv[0], who->name, chptr->chname);
-    return 0;
-  }
+  /* Don't allow the channel service to be kicked */
+  if (IsChannelService(who))
+    return send_reply(sptr, ERR_ISCHANSERVICE, who->name, chptr->chname);
 
 #ifdef NO_OPER_DEOP_LCHAN
-  /*
-   * Prevent kicking opers from local channels -DM-
-   */
-  if (IsOperOnLocalChannel(who, chptr->chname)) {
-    sendto_one(sptr, err_str(ERR_ISOPERLCHAN), me.name,
-               parv[0], who->name, chptr->chname);
-    return 0;
-  }
-#endif
-
-  /* 
-   * Servers can now send kicks without hacks during a netburst - they
-   * are kicking users from a +i channel.
-   *  - Isomer 25-11-1999
-   */
-  if (IsServer(sptr)
-#if defined(NO_INVITE_NETRIDE)
-      && !IsBurstOrBurstAck(sptr)
+  /* Prevent kicking opers from local channels -DM- */
+  if (IsOperOnLocalChannel(who, chptr->chname))
+    return send_reply(sptr, ERR_ISOPERLCHAN, who->name, chptr->chname);
 #endif
-     ) {
-    send_hack_notice(cptr, sptr, parc, parv, 1, 3);
-  }
-
-  if (IsServer(sptr) ||
-      ((member = find_member_link(chptr, who)) && !IsZombie(member)))
-  {
-    struct Membership* sptr_link = find_member_link(chptr, sptr);
-    if (who->from != cptr &&
-        ((sptr_link && IsDeopped(sptr_link)) || (!sptr_link && IsUser(sptr))))
-    {
-      /*
-       * Bounce here:
-       * cptr must be a server (or cptr == sptr and
-       * sptr->flags can't have DEOPPED set
-       * when CHANOP is set).
-       */
-      sendto_one(cptr, "%s%s " TOK_JOIN " %s", NumNick(who), chptr->chname);
-      if (IsChanOp(member))
-      {
-         sendto_one(cptr, "%s " TOK_MODE " %s +o %s%s " TIME_T_FMT,
-              NumServ(&me), chptr->chname, NumNick(who), chptr->creationtime);
-      }
-      if (HasVoice(member))
-      {
-         sendto_one(cptr, "%s " TOK_MODE " %s +v %s%s " TIME_T_FMT,
-              NumServ(&me), chptr->chname, NumNick(who), chptr->creationtime);
-      }
-    }
-    else
-    {
-      char* comment = (EmptyString(parv[parc - 1])) ? parv[0] : parv[parc - 1];
-      if (strlen(comment) > TOPICLEN)
-        comment[TOPICLEN] = '\0';
-
-      if (!IsLocalChannel(channel_name))
-      {
-        sendto_highprot_butone(cptr, 10, "%s%s " TOK_KICK " %s %s%s :%s",
-            NumNick(sptr), chptr->chname, NumNick(who), comment);
-      }
-      if (member) {
-        sendto_channel_butserv(chptr, sptr,
-            ":%s KICK %s %s :%s", parv[0], chptr->chname, who->name, comment);
-        make_zombie(member, who, cptr, sptr, chptr);
-      }
-    }
-  }
-  else if (MyUser(sptr))
-    sendto_one(sptr, err_str(ERR_USERNOTINCHANNEL),
-        me.name, parv[0], who->name, chptr->chname);
-
-  return 0;
-}
-
-/*
- * ms_kick - server message handler
- *
- * parv[0] = sender prefix
- * parv[1] = channel
- * parv[2] = client to kick
- * parv[parc-1] = kick comment
- */
-int ms_kick(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
-{
-  struct Client*  who;
-  struct Channel* chptr;
-  struct Membership* member = 0;
-  char*           channel_name;
 
-  sptr->flags &= ~FLAGS_TS8;
+  /* check if kicked user is actually on the channel */
+  if (!(member = find_member_link(chptr, who)) || IsZombie(member))
+    return send_reply(sptr, ERR_USERNOTINCHANNEL, who->name, chptr->chname);
 
-  if (parc < 3 || *parv[1] == '\0')
-    return need_more_params(sptr, "KICK");
+  /* We rely on ircd_snprintf to truncate the comment */
+  comment = EmptyString(parv[parc - 1]) ? parv[0] : parv[parc - 1];
 
-  channel_name = parv[1];
+  if (!IsLocalChannel(name))
+    sendcmdto_serv_butone(sptr, CMD_KICK, cptr, "%H %C :%s", chptr, who,
+                         comment);
 
-  if (IsLocalChannel(channel_name) && !MyUser(sptr))
-    return 0;
+  sendcmdto_channel_butserv(sptr, CMD_KICK, chptr, "%H %C :%s", chptr, who,
+                           comment);
 
-  if (IsModelessChannel(channel_name)) {
-    sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED), me.name, parv[0],
-               channel_name);
-    return 0;
-  }
-
-  chptr = get_channel(sptr, channel_name, CGT_NO_CREATE);
-  if (!chptr) {
-    sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0], channel_name);
-    return 0;
-  }
-
-  if (!IsServer(cptr) && !is_chan_op(sptr, chptr)) {
-    sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-               me.name, parv[0], chptr->chname);
-    return 0;
-  }
-
-  if (MyUser(sptr)) {
-    if (!(who = find_chasing(sptr, parv[2], 0)))
-      return 0;                 /* No such user left! */
-  }
-  else if (!(who = findNUser(parv[2])))
-    return 0;                   /* No such user left! */
-
-  /*
-   * if the user is +k, prevent a kick from local user
-   */
-  if (IsChannelService(who) && MyUser(sptr)) {
-    sendto_one(sptr, err_str(ERR_ISCHANSERVICE), me.name,
-        parv[0], who->name, chptr->chname);
-    return 0;
-  }
-
-#ifdef NO_OPER_DEOP_LCHAN
-  /*
-   * Prevent kicking opers from local channels -DM-
-   */
-  if (IsOperOnLocalChannel(who, chptr->chname)) {
-    sendto_one(sptr, err_str(ERR_ISOPERLCHAN), me.name,
-               parv[0], who->name, chptr->chname);
-    return 0;
-  }
-#endif
-
-#if defined(NO_INVITE_NETRIDE)
-  /* 
-   * Servers can now send kicks without hacks during a netburst - they
-   * are kicking users from a +i channel.
-   *  - Isomer 25-11-1999
-   */
-  if (IsServer(sptr) && !IsBurstOrBurstAck(sptr)) {
-#else
-  if (IsServer(sptr)) {
-#endif
-    send_hack_notice(cptr, sptr, parc, parv, 1, 3);
-  }
-
-  if (IsServer(sptr) ||
-      ((member = find_member_link(chptr, who)) && !IsZombie(member)))
-  {
-    struct Membership* sptr_link = find_member_link(chptr, sptr);
-    if (who->from != cptr &&
-        ((sptr_link && IsDeopped(sptr_link)) || (!sptr_link && IsUser(sptr))))
-    {
-      /*
-       * Bounce here:
-       * cptr must be a server (or cptr == sptr and
-       * sptr->flags can't have DEOPPED set
-       * when CHANOP is set).
-       */
-      sendto_one(cptr, "%s%s " TOK_JOIN " %s", NumNick(who), chptr->chname);
-      if (IsChanOp(member))
-      {
-         sendto_one(cptr, "%s " TOK_MODE " %s +o %s%s " TIME_T_FMT,
-              NumServ(&me), chptr->chname, NumNick(who), chptr->creationtime);
-      }
-      if (HasVoice(member))
-      {
-         sendto_one(cptr, "%s " TOK_MODE " %s +v %s%s " TIME_T_FMT,
-              NumServ(&me), chptr->chname, NumNick(who), chptr->creationtime);
-      }
-    }
-    else
-    {
-      char* comment = (EmptyString(parv[parc - 1])) ? parv[0] : parv[parc - 1];
-      if (strlen(comment) > TOPICLEN)
-        comment[TOPICLEN] = '\0';
-
-      if (!IsLocalChannel(channel_name)) {
-        if (IsServer(sptr)) {
-          sendto_highprot_butone(cptr, 10, "%s " TOK_KICK " %s %s%s :%s",
-                                 NumServ(sptr), chptr->chname, NumNick(who),
-                                 comment);
-        }
-        else {
-          sendto_highprot_butone(cptr, 10, "%s%s " TOK_KICK " %s %s%s :%s",
-                                 NumNick(sptr), chptr->chname, NumNick(who),
-                                 comment);
-        }
-      }
-      if (member) {
-        sendto_channel_butserv(chptr, sptr,
-            ":%s KICK %s %s :%s", parv[0], chptr->chname, who->name, comment);
-        make_zombie(member, who, cptr, sptr, chptr);
-      }
-    }
-  }
-  else if (MyUser(sptr))
-    sendto_one(sptr, err_str(ERR_USERNOTINCHANNEL),
-        me.name, parv[0], who->name, chptr->chname);
+  make_zombie(member, who, cptr, sptr, chptr);
 
   return 0;
 }
 
-
-#if 0
 /*
- * m_kick
+ * ms_kick - server message handler
  *
  * parv[0] = sender prefix
  * parv[1] = channel
  * parv[2] = client to kick
  * parv[parc-1] = kick comment
  */
-int m_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
+int ms_kick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
 {
-  struct Client*  who;
-  struct Channel* chptr;
-  struct Membership* member = 0;
-  char*           channel_name;
+  struct Client *who;
+  struct Channel *chptr;
+  struct Membership *member = 0, *sptr_link = 0;
+  char *name, *comment;
 
   sptr->flags &= ~FLAGS_TS8;
 
   if (parc < 3 || *parv[1] == '\0')
     return need_more_params(sptr, "KICK");
 
-  channel_name = parv[1];
+  name = parv[1];
+  comment = parv[parc - 1];
 
-  if (IsLocalChannel(channel_name) && !MyUser(sptr))
+  /* figure out who gets kicked from what */
+  if (IsLocalChannel(name) ||
+      !(chptr = get_channel(sptr, name, CGT_NO_CREATE)) ||
+      !(who = findNUser(parv[2])))
     return 0;
 
-  if (IsModelessChannel(channel_name)) {
-    sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED), me.name, parv[0],
-               channel_name);
-    return 0;
-  }
+  /* We go ahead and pass on the KICK for users not on the channel */
+  if (!(member = find_member_link(chptr, who)) || IsZombie(member))
+    member = 0;
 
-  chptr = get_channel(sptr, channel_name, CGT_NO_CREATE);
-  if (!chptr) {
-    sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0], channel_name);
-    return 0;
-  }
-
-  if (!IsServer(cptr) && !is_chan_op(sptr, chptr)) {
-    sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-               me.name, parv[0], chptr->chname);
-    return 0;
-  }
+  /* Send HACK notice, but not for servers in BURST */
+  if (IsServer(sptr) && !IsBurstOrBurstAck(sptr))
+    sendto_opmask_butone(0, SNO_HACK4, "HACK: %C KICK %H %C %s", sptr, chptr,
+                        who, comment);
 
-  if (MyUser(sptr)) {
-    if (!(who = find_chasing(sptr, parv[2], 0)))
-      return 0;                 /* No such user left! */
-  }
-  else if (!(who = findNUser(parv[2])))
-    return 0;                   /* No such user left! */
-
-  /*
-   * if the user is +k, prevent a kick from local user
+  /* Unless someone accepted it downstream (or the user isn't on the channel
+   * here), if kicker is not on channel, or if kicker is not a channel
+   * operator, bounce the kick
    */
-  if (IsChannelService(who) && MyUser(sptr)) {
-    sendto_one(sptr, err_str(ERR_ISCHANSERVICE), me.name,
-        parv[0], who->name, chptr->chname);
-    return 0;
-  }
+  if (!IsServer(sptr) && member && who->from != cptr &&
+      (!(sptr_link = find_member_link(chptr, sptr)) || !IsChanOp(sptr_link))) {
+    sendto_opmask_butone(0, SNO_HACK2, "HACK: %C KICK %H %C %s", sptr, chptr,
+                        who, comment);
 
-#ifdef NO_OPER_DEOP_LCHAN
-  /*
-   * Prevent kicking opers from local channels -DM-
-   */
-  if (IsOperOnLocalChannel(who, chptr->chname)) {
-    sendto_one(sptr, err_str(ERR_ISOPERLCHAN), me.name,
-               parv[0], who->name, chptr->chname);
-    return 0;
-  }
-#endif
+    sendcmdto_one(who, CMD_JOIN, cptr, "%H", chptr);
 
-  /* 
-   * Servers can now send kicks without hacks during a netburst - they
-   * are kicking users from a +i channel.
-   *  - Isomer 25-11-1999
-   */
-  if (IsServer(sptr)
-#if defined(NO_INVITE_NETRIDE)
-      && !IsBurstOrBurstAck(sptr)
-#endif
-     ) {
-    send_hack_notice(cptr, sptr, parc, parv, 1, 3);
-  }
+    /* Reop/revoice member */
+    if (IsChanOp(member) || HasVoice(member)) {
+      struct ModeBuf mbuf;
+
+      modebuf_init(&mbuf, sptr, cptr, chptr,
+                  (MODEBUF_DEST_SERVER |  /* Send mode to a server */
+                   MODEBUF_DEST_DEOP   |  /* Deop the source */
+                   MODEBUF_DEST_BOUNCE)); /* And bounce the MODE */
 
-  if (IsServer(sptr) ||
-      ((member = find_member_link(chptr, who)) && !IsZombie(member)))
-  {
-    struct Membership* sptr_link = find_member_link(chptr, sptr);
-    if (who->from != cptr &&
-        ((sptr_link && IsDeopped(sptr_link)) || (!sptr_link && IsUser(sptr))))
-    {
-      /*
-       * Bounce here:
-       * cptr must be a server (or cptr == sptr and
-       * sptr->flags can't have DEOPPED set
-       * when CHANOP is set).
-       */
-      sendto_one(cptr, "%s%s " TOK_JOIN " %s", NumNick(who), chptr->chname);
       if (IsChanOp(member))
-      {
-         sendto_one(cptr, "%s " TOK_MODE " %s +o %s%s " TIME_T_FMT,
-              NumServ(&me), chptr->chname, NumNick(who), chptr->creationtime);
-      }
+       modebuf_mode_client(&mbuf, MODE_DEL | MODE_CHANOP, who);
       if (HasVoice(member))
-      {
-         sendto_one(cptr, "%s " TOK_MODE " %s +v %s%s " TIME_T_FMT,
-              NumServ(&me), chptr->chname, NumNick(who), chptr->creationtime);
-      }
+       modebuf_mode_client(&mbuf, MODE_DEL | MODE_VOICE, who);
+
+      modebuf_flush(&mbuf);
     }
-    else
-    {
-      char* comment = (EmptyString(parv[parc - 1])) ? parv[0] : parv[parc - 1];
-      if (strlen(comment) > TOPICLEN)
-        comment[TOPICLEN] = '\0';
-
-      if (!IsLocalChannel(channel_name))
-      {
-        sendto_highprot_butone(cptr, 10, "%s%s " TOK_KICK " %s %s%s :%s",
-            NumNick(sptr), chptr->chname, NumNick(who), comment);
-      }
-      if (member) {
-        sendto_channel_butserv(chptr, sptr,
-            ":%s KICK %s %s :%s", parv[0], chptr->chname, who->name, comment);
-        make_zombie(member, who, cptr, sptr, chptr);
-      }
+  } else {
+    /* Propagate kick... */
+    sendcmdto_serv_butone(sptr, CMD_KICK, cptr, "%H %C :%s", chptr, who,
+                         comment);
+
+    if (member) { /* and tell the channel about it */
+      sendcmdto_channel_butserv(sptr, CMD_KICK, chptr, "%H %C :%s", chptr, who,
+                               comment);
+
+      make_zombie(member, who, cptr, sptr, chptr);
     }
   }
-  else if (MyUser(sptr))
-    sendto_one(sptr, err_str(ERR_USERNOTINCHANNEL),
-        me.name, parv[0], who->name, chptr->chname);
 
   return 0;
 }
-#endif /* 0 */
-