merge

diff --cc ircd/channel.c
Simple merge

diff --cc ircd/m_names.c
index 4d2ddcd54ed6968f85f66ec5dd86c8ead0e4a8df,b7428310eee522e15693194569c82913e000697e..67c7728146275f9c5c67230129347f03aed9ac14
--- 1/ircd/m_names.c
--- 2/ircd/m_names.c
+++ b/ircd/m_names.c
@@@ -187,8 -177,16 +177,8 @@@ void do_names(struct Client* sptr, stru
      flag = 1;
      if (mlen + idx + NICKLEN + 5 > BUFSIZE)
        /* 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;