Author: Kev <klmitch@mit.edu>

Log message:

Pulled up the do_names() fix from u2.10.10.pl11

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

diff --git a/ChangeLog b/ChangeLog
index 68dcd218b8294d1b991c5e9782d17c2957fdd08b..df8951c72ee4cd99a6a3c5fb4beb8c9a21f9e42a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-30  Kevin L. Mitchell  <klmitch@mit.edu>
+
+       * ircd/m_names.c (do_names): pull-up from do_names fix in
+       u2.10.10.pl11
+
 2000-07-15  Perry Lorier       <Isomer@coders.net>
        * various: IP only k:'s and G:'s now do bit tests instead of two(!) 
                  match()'s.  Major Major cpu savings.  Also speed up the
@@ -1286,7 +1291,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.158 2000-07-15 23:55:32 isomer Exp $
+# $Id: ChangeLog,v 1.159 2000-08-30 15:58:53 kev Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/m_names.c b/ircd/m_names.c
index e1bfb3f258a7968729248929f260282ec07fc543..90fe89488cc8c6de020d1ed0712522ddbed90ce9 100644 (file)
--- a/ircd/m_names.c
+++ b/ircd/m_names.c
@@ -155,6 +155,9 @@ void do_names(struct Client* sptr, struct Channel* chptr, int filter)
     if ((filter == NAMES_VIS) && IsInvisible(c2ptr))
       continue;
 
+    if (IsZombie(member) && member->user != sptr)
+      continue;
+
     if (needs_space) {
        strcat(buf, " ");
       idx++;
@@ -162,13 +165,8 @@ void do_names(struct Client* sptr, struct Channel* chptr, int filter)
     needs_space=1;
     if (IsZombie(member))
     {
-      if (member->user != sptr)
-        continue;
-      else
-      {
-        strcat(buf, "!");
-        idx++;
-      }
+      strcat(buf, "!");
+      idx++;
     }
     else if (IsChanOp(member))
     {