m_list: fail on invalid parameters

[solanum.git] / modules / m_names.c

diff --git a/modules/m_names.c b/modules/m_names.c
index 1bb8a556c7465d852e5ce57d5f520fae43e88e5d..a5e1e9203ac6f8cd7a21f9acf0610008714e7a5c 100644 (file)
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -25,7 +25,6 @@
 #include "stdinc.h"
 #include "channel.h"
 #include "client.h"
-#include "common.h"
 #include "hash.h"
 #include "match.h"
 #include "ircd.h"
@@ -36,6 +35,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "s_newconf.h"
 
 static const char names_desc[] = "Provides the NAMES command to view users on a channel";
 
@@ -89,7 +89,7 @@ m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
        }
        else
        {
-               if(!IsOper(source_p))
+               if(!IsOperGeneral(source_p))
                {
                        if((last_used + ConfigFileEntry.pace_wait) > rb_current_time())
                        {
@@ -107,8 +107,6 @@ m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                sendto_one(source_p, form_str(RPL_ENDOFNAMES),
                           me.name, source_p->name, "*");
        }
-
-       return;
 }
 
 /*
@@ -121,16 +119,10 @@ m_names(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 static void
 names_global(struct Client *source_p)
 {
-       int mlen;
-       int tlen;
-       int cur_len;
        bool dont_show = false;
-       rb_dlink_node *lp, *ptr;
+       rb_dlink_node *ptr;
        struct Client *target_p;
        struct Channel *chptr = NULL;
-       struct membership *msptr;
-       char buf[BUFSIZE];
-       char *t;
 
        /* first do all visible channels */
        RB_DLINK_FOREACH(ptr, global_channel_list.head)
@@ -138,13 +130,19 @@ names_global(struct Client *source_p)
                chptr = ptr->data;
                channel_member_names(chptr, source_p, 0);
        }
-       cur_len = mlen = sprintf(buf, form_str(RPL_NAMREPLY),
-                                   me.name, source_p->name, "*", "*");
-       t = buf + mlen;
+
+       send_multiline_init(source_p, " ", form_str(RPL_NAMREPLY),
+                                   me.name,
+                                   source_p->name,
+                                   "*",
+                                   "*");
 
        /* Second, do all clients in one big sweep */
        RB_DLINK_FOREACH(ptr, global_client_list.head)
        {
+               rb_dlink_node *ps, *pt;
+               struct membership *ms, *mt;
+
                target_p = ptr->data;
                dont_show = false;
 
@@ -158,13 +156,11 @@ names_global(struct Client *source_p)
                 * both were missed out above.  if the target is on a
                 * common channel with source, its already been shown.
                 */
-               RB_DLINK_FOREACH(lp, target_p->user->channel.head)
+               ITER_COMM_CHANNELS(ps, pt, source_p->user->channel.head, target_p->user->channel.head, ms, mt, chptr)
                {
-                       msptr = lp->data;
-                       chptr = msptr->chptr;
+                       if (!mt) continue;
 
-                       if(PubChannel(chptr) || IsMember(source_p, chptr) ||
-                          SecretChannel(chptr))
+                       if (PubChannel(chptr) || SecretChannel(chptr) || ms)
                        {
                                dont_show = true;
                                break;
@@ -174,18 +170,18 @@ names_global(struct Client *source_p)
                if(dont_show)
                        continue;
 
-               if((cur_len + NICKLEN + 2) > (BUFSIZE - 3))
+               if (IsCapable(source_p, CLICAP_USERHOST_IN_NAMES))
                {
-                       sendto_one(source_p, "%s", buf);
-                       cur_len = mlen;
-                       t = buf + mlen;
+                       send_multiline_item(source_p, "%s!%s@%s",
+                                       target_p->name,
+                                       target_p->username,
+                                       target_p->host);
+               }
+               else
+               {
+                       send_multiline_item(source_p, "%s", target_p->name);
                }
-
-               tlen = sprintf(t, "%s ", target_p->name);
-               cur_len += tlen;
-               t += tlen;
        }
 
-       if(cur_len > mlen)
-               sendto_one(source_p, "%s", buf);
+       send_multiline_fini(source_p, NULL);
 }