providers/opm: use a name that makes more sense for this variable

[solanum.git] / modules / m_privs.c

diff --git a/modules/m_privs.c b/modules/m_privs.c
index 1d24aad5ad9235ffbd809cc8bce00f0d4e84d71e..d8a32ebbebf884c3433e8e315b09b0b43507e0e7 100644 (file)
--- a/modules/m_privs.c
+++ b/modules/m_privs.c
@@ -31,7 +31,6 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "common.h"
 #include "numeric.h"
 #include "send.h"
 #include "msg.h"
@@ -40,12 +39,15 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 
-static int me_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
-static int mo_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static const char privs_desc[] = "Provides the PRIVS command to inspect an operator's privileges";
+
+static void m_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void me_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static void mo_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message privs_msgtab = {
-       "PRIVS", 0, 0, 0, MFLG_SLOW,
-       {mg_unreg, mg_not_oper, mg_ignore, mg_ignore, {me_privs, 0}, {mo_privs, 0}}
+       "PRIVS", 0, 0, 0, 0,
+       {mg_unreg, {m_privs, 0}, mg_ignore, mg_ignore, {me_privs, 0}, {mo_privs, 0}}
 };
 
 mapi_clist_av1 privs_clist[] = {
@@ -57,7 +59,7 @@ mapi_clist_av1 privs_clist[] = {
 struct mode_table
 {
        const char *name;
-       int mode;
+       unsigned int mode;
 };
 
 /* there is no such table like this anywhere else */
@@ -68,10 +70,11 @@ static struct mode_table auth_client_table[] = {
        {"spambot_exempt",      FLAGS2_EXEMPTSPAMBOT    },
        {"shide_exempt",        FLAGS2_EXEMPTSHIDE      },
        {"jupe_exempt",         FLAGS2_EXEMPTJUPE       },
+       {"extend_chans",        FLAGS2_EXTENDCHANS      },
        {NULL, 0}
 };
 
-DECLARE_MODULE_AV1(privs, NULL, NULL, privs_clist, NULL, NULL, "");
+DECLARE_MODULE_AV2(privs, NULL, NULL, privs_clist, NULL, NULL, NULL, NULL, privs_desc);
 
 static void show_privs(struct Client *source_p, struct Client *target_p)
 {
@@ -111,21 +114,21 @@ static void show_privs(struct Client *source_p, struct Client *target_p)
                        target_p->name, buf);
 }
 
-static int me_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+me_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
 
        if (!IsOper(source_p) || parc < 2 || EmptyString(parv[1]))
-               return 0;
+               return;
 
        /* we cannot show privs for remote clients */
        if((target_p = find_person(parv[1])) && MyClient(target_p))
                show_privs(source_p, target_p);
-
-       return 0;
 }
 
-static int mo_privs(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct Client *target_p;
 
@@ -138,7 +141,7 @@ static int mo_privs(struct Client *client_p, struct Client *source_p, int parc,
                {
                        sendto_one_numeric(source_p, ERR_NOSUCHNICK,
                                           form_str(ERR_NOSUCHNICK), parv[1]);
-                       return 0;
+                       return;
                }
        }
 
@@ -149,5 +152,17 @@ static int mo_privs(struct Client *client_p, struct Client *source_p, int parc,
                                get_id(source_p, target_p),
                                target_p->servptr->name,
                                use_id(target_p));
-       return 0;
+}
+
+static void
+m_privs(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+{
+       if (parc >= 2 && !EmptyString(parv[1]) &&
+                       irccmp(parv[1], source_p->name)) {
+               sendto_one_numeric(source_p, ERR_NOPRIVILEGES,
+                                  form_str(ERR_NOPRIVILEGES));
+               return;
+       }
+
+       show_privs(source_p, source_p);
 }