Show users on second (and later) lines of RPL_NAMREPLY correctly.

Thanks to paulr for highlighting where the problem was.

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

diff --git a/ChangeLog b/ChangeLog
index 4f006262979666abefd36c9e077dc6b98468e4c8..131e12d2d53f4fc2a04b7bb96f9b0f13862b6a60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-24  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/m_names.c (do_names): Don't try to re-initialize the start
+       of buf[] for each line.  It's done the first time around and that
+       can be reused safely.
+
 2007-11-17  Michael Poole <mdpoole@troilus.org>
 
        * ircd/m_stats.c (m_stats): Properly assign param before it is

diff --git a/ircd/m_names.c b/ircd/m_names.c
index 8b9509fbcc783ef875fd59966c51daff259fd180..6c84d5079b8bae2e4655e90c55a67e8fce5f5e91 100644 (file)
--- a/ircd/m_names.c
+++ b/ircd/m_names.c
@@ -179,14 +179,6 @@ void do_names(struct Client* sptr, struct Channel* chptr, int filter)
       /* space, modifier, nick, \r \n \0 */
     {
       send_reply(sptr, (filter & NAMES_DEL) ? RPL_DELNAMREPLY : RPL_NAMREPLY, buf);
-      strcpy(buf, "* ");
-      ircd_strncpy(buf + 2, chptr->chname, len + 1);
-      buf[len + 2] = ':';
-      buf[len + 3] = '\0';
-      if (PubChannel(chptr))
-        *buf = '=';
-      else if (SecretChannel(chptr))
-        *buf = '@';
       idx = len + 4;
       flag = 0;
       needs_space=0;