#include "stdinc.h"
#include "client.h"
-#include "common.h"
#include "numeric.h"
#include "send.h"
#include "msg.h"
#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[] = {
NULL
};
-/* XXX this is a copy, not so nice */
+/* XXX this is a copy, not so nice
+ *
+ * Sort of... it's int in newconf.c since oper confs don't need 64-bit wide flags.
+ * --Elizafox
+ */
struct mode_table
{
const char *name;
- int mode;
-};
-
-static struct mode_table oper_table[] = {
- /*{"encrypted", OPER_ENCRYPTED },*/
- {"local_kill", OPER_LOCKILL },
- {"global_kill", OPER_GLOBKILL/*|OPER_LOCKILL*/ },
- {"remote", OPER_REMOTE },
- {"kline", OPER_KLINE },
- {"unkline", OPER_UNKLINE },
- {"nick_changes", OPER_NICKS },
- {"rehash", OPER_REHASH },
- {"die", OPER_DIE },
- {"admin", OPER_ADMIN },
- {"hidden_admin", OPER_HADMIN },
- {"xline", OPER_XLINE },
- {"resv", OPER_RESV },
- {"operwall", OPER_OPERWALL },
- {"oper_spy", OPER_SPY },
- {"hidden_oper", OPER_INVIS },
- {"remoteban", OPER_REMOTEBAN },
- {"mass_notice", OPER_MASSNOTICE },
- {NULL, 0}
+ uint64_t mode;
};
/* there is no such table like this anywhere else */
static struct mode_table auth_client_table[] = {
- {"resv_exempt", FLAGS2_EXEMPTRESV },
- {"kline_exempt", FLAGS2_EXEMPTKLINE },
- {"flood_exempt", FLAGS2_EXEMPTFLOOD },
- {"spambot_exempt", FLAGS2_EXEMPTSPAMBOT },
- {"shide_exempt", FLAGS2_EXEMPTSHIDE },
- {"jupe_exempt", FLAGS2_EXEMPTJUPE },
+ {"resv_exempt", FLAGS_EXEMPTRESV },
+ {"kline_exempt", FLAGS_EXEMPTKLINE },
+ {"flood_exempt", FLAGS_EXEMPTFLOOD },
+ {"spambot_exempt", FLAGS_EXEMPTSPAMBOT },
+ {"shide_exempt", FLAGS_EXEMPTSHIDE },
+ {"jupe_exempt", FLAGS_EXEMPTJUPE },
+ {"extend_chans", FLAGS_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)
{
struct mode_table *p;
buf[0] = '\0';
- p = &oper_table[0];
- while (p->name != NULL)
- {
- if (target_p->flags2 & p->mode)
- {
- if (buf[0] != '\0')
- rb_strlcat(buf, " ", sizeof buf);
- rb_strlcat(buf, p->name, sizeof buf);
- }
- p++;
- }
+ if (target_p->localClient->privset)
+ rb_strlcat(buf, target_p->localClient->privset->privs, sizeof buf);
if (IsOper(target_p))
{
if (buf[0] != '\0')
rb_strlcat(buf, " ", sizeof buf);
rb_strlcat(buf, "operator:", sizeof buf);
rb_strlcat(buf, target_p->localClient->opername, sizeof buf);
+
+ if (target_p->localClient->privset)
+ {
+ if (buf[0] != '\0')
+ rb_strlcat(buf, " ", sizeof buf);
+ rb_strlcat(buf, "privset:", sizeof buf);
+ rb_strlcat(buf, target_p->localClient->privset->name, sizeof buf);
+ }
}
p = &auth_client_table[0];
while (p->name != NULL)
{
- if (target_p->flags2 & p->mode)
+ if (target_p->flags & p->mode)
{
if (buf[0] != '\0')
rb_strlcat(buf, " ", sizeof buf);
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;
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK,
form_str(ERR_NOSUCHNICK), parv[1]);
- return 0;
+ return;
}
}
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);
}
projects / solanum.git / blobdiff