#include "s_newconf.h"
#include "logger.h"
#include "chmode.h"
+#include "irc_dictionary.h"
/* bitmasks for error returns, so we send once per call */
#define SM_ERR_NOTS 0x00000001 /* No TS on channel */
static int mode_limit;
static int mode_limit_simple;
static int mask_pos;
+static int no_override_deop;
char cflagsbuf[256];
char cflagsmyinfo[256];
!(chmode_table[i].set_func == chm_throttle) &&
!(chmode_table[i].set_func == chm_key) &&
!(chmode_table[i].set_func == chm_limit) &&
- !(chmode_table[i].set_func == chm_owner) &&
+ !(chmode_table[i].set_func == chm_admin) &&
!(chmode_table[i].set_func == chm_op) &&
!(chmode_table[i].set_func == chm_halfop) &&
!(chmode_table[i].set_func == chm_voice))
static int
get_channel_access(struct Client *source_p, struct membership *msptr)
{
- if(!MyClient(source_p) || is_owner(msptr))
- return CHFL_OWNER;
+ if(!MyClient(source_p) || is_admin(msptr))
+ return CHFL_ADMIN;
else if(is_chanop(msptr))
return CHFL_CHANOP;
else if(is_halfop(msptr))
{
int override = 0;
+ struct Metadata *md;
+ struct DictionaryIter iter;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
if (IsOverride(source_p))
override = 1;
}
else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
{
+ /* cleanup metadata when the related mode is removed */
+ if(c == 'J')
+ {
+ DICTIONARY_FOREACH(md, &iter, chptr->metadata)
+ {
+ if(!strcmp(md->value, "KICKNOREJOIN"))
+ channel_metadata_delete(chptr, md->name, 0);
+ }
+ }
+ if(c == 'K')
+ channel_metadata_delete(chptr, "NOREPEAT", 0);
+
chptr->mode.mode &= ~mode_type;
mode_changes[mode_count].letter = c;
}
}
+void
+chm_hidden(struct Client *source_p, struct Channel *chptr,
+ int alevel, int parc, int *parn,
+ const char **parv, int *errors, int dir, char c, long mode_type)
+{
+ if(!IsOper(source_p) && !IsServer(source_p))
+ {
+ if(!(*errors & SM_ERR_NOPRIVS))
+ sendto_one_numeric(source_p, ERR_NOPRIVILEGES, form_str(ERR_NOPRIVILEGES));
+ *errors |= SM_ERR_NOPRIVS;
+ return;
+ }
+ if(MyClient(source_p) && !IsOperAdmin(source_p))
+ {
+ if(!(*errors & SM_ERR_NOPRIVS))
+ sendto_one(source_p, form_str(ERR_NOPRIVS), me.name,
+ source_p->name, "cmodes");
+ *errors |= SM_ERR_NOPRIVS;
+ return;
+ }
+
+ if(MyClient(source_p) && (++mode_limit_simple > MAXMODES_SIMPLE))
+ return;
+
+ /* setting + */
+ if((dir == MODE_ADD) && !(chptr->mode.mode & mode_type))
+ {
+ chptr->mode.mode |= mode_type;
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_ADD;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].mems = ONLY_OPERS;
+ mode_changes[mode_count].override = 0;
+ mode_changes[mode_count++].arg = NULL;
+ }
+ else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
+ {
+ chptr->mode.mode &= ~mode_type;
+
+ mode_changes[mode_count].letter = c;
+ mode_changes[mode_count].dir = MODE_DEL;
+ mode_changes[mode_count].caps = 0;
+ mode_changes[mode_count].nocaps = 0;
+ mode_changes[mode_count].mems = ONLY_OPERS;
+ mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = 0;
+ mode_changes[mode_count++].arg = NULL;
+ }
+}
+
void
chm_staff(struct Client *source_p, struct Channel *chptr,
int alevel, int parc, int *parn,
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].override = 0;
mode_changes[mode_count++].arg = NULL;
}
else if((dir == MODE_DEL) && (chptr->mode.mode & mode_type))
mode_changes[mode_count].caps = 0;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
+ mode_changes[mode_count].override = 0;
mode_changes[mode_count].id = NULL;
mode_changes[mode_count++].arg = NULL;
}
int rpl_endlist;
int caps;
int mems;
+ int override = 0;
switch (mode_type)
{
*errors |= errorval;
/* non-ops cant see +eI lists.. */
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP && mode_type != CHFL_BAN &&
mode_type != CHFL_QUIET)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "%s is overriding modes on %s: (%s list)",
+ get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: (%s list)",
+ me.name, get_oper_name(source_p), chptr->chname, mode_type == CHFL_INVEX ? "invex" : "exempt");
+ }
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
RB_DLINK_FOREACH(ptr, list->head)
return;
}
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(MyClient(source_p) && (++mode_limit > MAXMODEPARAMS))
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = mems;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = mask;
}
else if(dir == MODE_DEL)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = mems;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = mask;
}
}
void
-chm_owner(struct Client *source_p, struct Channel *chptr,
+chm_admin(struct Client *source_p, struct Channel *chptr,
int alevel, int parc, int *parn,
const char **parv, int *errors, int dir, char c, long mode_type)
{
struct membership *mstptr;
- const char *ownernick;
+ const char *adminnick;
struct Client *targ_p;
+ int override = 0;
- if(!ConfigChannel.use_owner)
+ if(!ConfigChannel.use_admin)
{
if(*errors & SM_ERR_UNKNOWN)
return;
return;
}
- if(alevel != CHFL_OWNER)
+ if(alevel != CHFL_ADMIN)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, ":%s 482 %s %s :You're not a channel administrator", me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if((dir == MODE_QUERY) || (parc <= *parn))
return;
- ownernick = parv[(*parn)];
+ adminnick = parv[(*parn)];
(*parn)++;
/* empty nick */
- if(EmptyString(ownernick))
+ if(EmptyString(adminnick))
{
sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), "*");
return;
}
- if((targ_p = find_chasing(source_p, ownernick, NULL)) == NULL)
+ if((targ_p = find_chasing(source_p, adminnick, NULL)) == NULL)
{
return;
}
{
if(!(*errors & SM_ERR_NOTONCHANNEL) && MyClient(source_p))
sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,
- form_str(ERR_USERNOTINCHANNEL), ownernick, chptr->chname);
+ form_str(ERR_USERNOTINCHANNEL), adminnick, chptr->chname);
*errors |= SM_ERR_NOTONCHANNEL;
return;
}
if(dir == MODE_ADD)
{
if(targ_p == source_p)
- return;
+ {
+ no_override_deop = 1;
+ /* Don't reject modes from remote. It desyncs, and this is perfectly
+ * legitimate from a remote override oper.
+ if(!override)
+ return;
+ */
+ }
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
- mstptr->flags |= CHFL_OWNER;
+ mstptr->flags |= CHFL_ADMIN;
}
else
{
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
- mstptr->flags &= ~CHFL_OWNER;
+ mstptr->flags &= ~CHFL_ADMIN;
}
}
struct membership *mstptr;
const char *opnick;
struct Client *targ_p;
+ int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if((dir == MODE_QUERY) || (parc <= *parn))
if(dir == MODE_ADD)
{
if(targ_p == source_p)
- return;
+ {
+ no_override_deop = 1;
+ /* Don't reject modes from remote. It desyncs, and this is perfectly
+ * legitimate from a remote override oper.
+ if(!override)
+ return;
+ */
+ }
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags |= CHFL_CHANOP;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags &= ~CHFL_CHANOP;
struct membership *mstptr;
const char *halfopnick;
struct Client *targ_p;
+ int override = 0;
if(!ConfigChannel.use_halfop)
{
return;
}
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if((dir == MODE_QUERY) || (parc <= *parn))
if(dir == MODE_ADD)
{
if(targ_p == source_p)
- return;
+ {
+ no_override_deop = 1;
+ /* Don't reject modes from remote. It desyncs, and this is perfectly
+ * legitimate from a remote override oper.
+ if(!override)
+ return;
+ */
+ }
mode_changes[mode_count].letter = c;
mode_changes[mode_count].dir = MODE_ADD;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags |= CHFL_HALFOP;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags &= ~CHFL_HALFOP;
struct membership *mstptr;
const char *opnick;
struct Client *targ_p;
+ int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if((dir == MODE_QUERY) || parc <= *parn)
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags |= CHFL_VOICE;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = targ_p->id;
mode_changes[mode_count].arg = targ_p->name;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].client = targ_p;
mstptr->flags &= ~CHFL_VOICE;
const char *lstr;
static char limitstr[30];
int limit;
+ int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(dir == MODE_QUERY)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = limitstr;
chptr->mode.limit = limit;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
}
const char **parv, int *errors, int dir, char c, long mode_type)
{
int joins = 0, timeslice = 0;
+ int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(dir == MODE_QUERY)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = parv[(*parn)];
(*parn)++;
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
}
struct Channel *targptr = NULL;
struct membership *msptr;
const char *forward;
+ int override = 0;
/* if +f is disabled, ignore local attempts to set it */
if(!ConfigChannel.use_forward && MyClient(source_p) &&
}
#ifndef FORWARD_OPERONLY
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
#else
if(!IsOper(source_p) && !IsServer(source_p))
if((msptr = find_channel_membership(targptr, source_p)) == NULL ||
is_any_op(msptr))
{
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, targptr->chname);
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, targptr->chname);
+ return;
+ }
}
}
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ConfigChannel.use_forward ? ALL_MEMBERS : ONLY_SERVERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = forward;
}
else if(dir == MODE_DEL)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
}
const char **parv, int *errors, int dir, char c, long mode_type)
{
char *key;
+ int override = 0;
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(dir == MODE_QUERY)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = chptr->mode.key;
}
else if(dir == MODE_DEL)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = "*";
}
}
int alevel, int parc, int *parn,
const char **parv, int *errors, int dir, char c, long mode_type)
{
- if(alevel != CHFL_CHANOP && alevel != CHFL_OWNER && alevel != CHFL_HALFOP)
+ int override = 0;
+
+ if(alevel != CHFL_CHANOP && alevel != CHFL_ADMIN && alevel != CHFL_HALFOP)
{
- if(!(*errors & SM_ERR_NOOPS))
- sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
- me.name, source_p->name, chptr->chname);
- *errors |= SM_ERR_NOOPS;
- return;
+ if(IsOverride(source_p))
+ override = 1;
+ else
+ {
+ if(!(*errors & SM_ERR_NOOPS))
+ sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+ me.name, source_p->name, chptr->chname);
+ *errors |= SM_ERR_NOOPS;
+ return;
+ }
}
if(dir == MODE_QUERY)
mode_changes[mode_count].nocaps = 0;
mode_changes[mode_count].mems = ALL_MEMBERS;
mode_changes[mode_count].id = NULL;
+ mode_changes[mode_count].override = override;
mode_changes[mode_count++].arg = NULL;
}
{chm_simple, MODE_NOREJOIN }, /* J */
{chm_simple, MODE_NOREPEAT }, /* K */
{chm_staff, MODE_EXLIMIT }, /* L */
- {chm_nosuch, 0 }, /* M */
+ {chm_hidden, MODE_NOOPERKICK }, /* M */
{chm_simple, MODE_NONICK }, /* N */
{chm_nosuch, 0 }, /* O */
{chm_staff, MODE_PERMANENT }, /* P */
{chm_nosuch, 0 },
{chm_nosuch, 0 },
{chm_nosuch, 0 },
- {chm_owner, 0 }, /* a */
+ {chm_admin, 0 }, /* a */
{chm_ban, CHFL_BAN }, /* b */
{chm_simple, MODE_NOCOLOR }, /* c */
{chm_nosuch, 0 }, /* d */
const char *ml = parv[0];
char c;
struct Client *fakesource_p;
+ int flags_list[3] = { ALL_MEMBERS, ONLY_CHANOPS, ONLY_OPERS };
mask_pos = 0;
mode_count = 0;
alevel = get_channel_access(source_p, msptr);
+ no_override_deop = 0;
+
/* Hide connecting server on netburst -- jilles */
if (ConfigServerHide.flatten_links && IsServer(source_p) && !has_id(source_p) && !HasSentEob(source_p))
fakesource_p = &me;
source_p->name, source_p->username,
source_p->host, chptr->chname);
- for (override = 0; override < (IsOverride(source_p) ? 2 : 1); ++override)
+ mlen = 0;
+
+ for (override = 0; override < (IsOverride(source_p) && alevel != CHFL_CHANOP ? 2 : 1); ++override)
{
int was_on_chan = 0;
+
if(override)
{
if(msptr)
+ {
was_on_chan = 1;
+ msptr->flags |= CHFL_CHANOP;
+ }
else
- add_user_to_channel(chptr, source_p, 0);
+ add_user_to_channel(chptr, source_p, CHFL_CHANOP);
}
- for(j = 0, flags = ALL_MEMBERS; j < 2; j++, flags = ONLY_CHANOPS)
+ for(j = 0, flags = flags_list[0]; j < 3; j++, flags = flags_list[j])
{
cur_len = mlen;
mbuf = modebuf + mlen;
for(i = 0; i < mode_count; i++)
{
if(mode_changes[i].letter == 0 || mode_changes[i].mems != flags)
+ continue;
if(mode_changes[i].override != override)
continue;
* bufsize (4 == +/-,modechar,two spaces) send now.
*/
if(mode_changes[i].arg != NULL &&
- ((paracount == MAXMODEPARAMSSERV) ||
- ((cur_len + paralen + arglen + 4) > (BUFSIZE - 3))))
+ ((paracount == MAXMODEPARAMSSERV) ||
+ ((cur_len + paralen + arglen + 4) > (BUFSIZE - 3))))
{
*mbuf = '\0';
if(cur_len > mlen)
{
sendto_channel_local(flags, chptr, "%s%s %s",
- cmdbuf, modebuf, parabuf);
+ cmdbuf, modebuf, parabuf);
if(override)
- sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
"%s is overriding modes on %s: %s %s",
- get_oper_name(source_p), chptr->chname,
- modebuf, parabuf);
+ get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+ me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ }
}
else
continue;
}
}
- if(override && !was_on_chan)
+ if(paralen && parabuf[paralen - 1] == ' ')
+ parabuf[paralen - 1] = '\0';
+
+ *mbuf = '\0';
+ if(cur_len > mlen)
+ {
+ sendto_channel_local(flags, chptr, "%s%s %s", cmdbuf, modebuf, parabuf);
+ if(override)
+ {
+ sendto_wallops_flags(UMODE_WALLOP, &me,
+ "%s is overriding modes on %s: %s %s",
+ get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+ ":%s WALLOPS :%s is overriding modes on %s: %s %s",
+ me.name, get_oper_name(source_p), chptr->chname, modebuf, parabuf);
+ }
+ }
+ }
+ if(override)
+ {
+ if(!was_on_chan)
remove_user_from_channel(find_channel_membership(chptr, source_p));
+ else if (!no_override_deop)
+ msptr->flags &= ~CHFL_CHANOP;
+ }
}
+
/* only propagate modes originating locally, or if we're hubbing */
if(MyClient(source_p) || rb_dlink_list_length(&serv_list) > 1)
send_cap_mode_changes(client_p, source_p, chptr, mode_changes, mode_count);
- }
}
projects / irc / rqf / shadowircd.git / blobdiff