9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

extensions/override: display mode-change string in override messages

Browse source
This commit is contained in:
William Pitcock 2016-01-11 22:40:32 -06:00
parent 7abb4a4f0d
commit b870a5f8e9
7 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/m_remove.c
View file

@ -114,7 +114,7 @@ m_remove(struct Client *client_p, struct Client *source_p, int parc, const char
return 0;
}
if(get_channel_access(source_p, msptr, MODE_ADD) < CHFL_CHANOP)
if(get_channel_access(source_p, msptr, MODE_ADD, NULL) < CHFL_CHANOP)
{
if(MyConnect(source_p))
{

6
extensions/override.c
View file

@ -164,8 +164,10 @@ hack_channel_access(void *vdata)
update_session_deadline(data->client, NULL);
data->approved = CHFL_CHANOP;
sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (modehacking)",
get_oper_name(data->client), data->chptr->chname);
/* we only want to report modehacks, which are always non-NULL */
if (data->modestr)
sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s is using oper-override on %s (modehacking: %s)",
get_oper_name(data->client), data->chptr->chname, data->modestr);
}
}

2
include/channel.h
View file

@ -275,7 +275,7 @@ extern int match_extban(const char *banstr, struct Client *client_p, struct Chan
extern int valid_extban(const char *banstr, struct Client *client_p, struct Channel *chptr, long mode_type);
const char * get_extban_string(void);
extern int get_channel_access(struct Client *source_p, struct membership *msptr, int dir);
extern int get_channel_access(struct Client *source_p, struct membership *msptr, int dir, const char *modestr);
extern void send_channel_join(struct Channel *chptr, struct Client *client_p);

1
include/hook.h
View file

@ -85,6 +85,7 @@ typedef struct
struct Client *target;
int approved;
int dir;
const char *modestr;
} hook_data_channel_approval;
typedef struct

12
ircd/chmode.c
View file

@ -43,6 +43,7 @@
#include "logger.h"
#include "chmode.h"
#include "s_assert.h"
#include "parse.h"
/* bitmasks for error returns, so we send once per call */
#define SM_ERR_NOTS 0x00000001 /* No TS on channel */
@ -179,7 +180,7 @@ cflag_orphan(char c_)
}
int
get_channel_access(struct Client *source_p, struct membership *msptr, int dir)
get_channel_access(struct Client *source_p, struct membership *msptr, int dir, const char *modestr)
{
hook_data_channel_approval moduledata;
@ -195,6 +196,7 @@ get_channel_access(struct Client *source_p, struct membership *msptr, int dir)
moduledata.target = NULL;
moduledata.approved = is_chanop(msptr) ? CHFL_CHANOP : CHFL_PEON;
moduledata.dir = dir;
moduledata.modestr = modestr;
call_hook(h_get_channel_access, &moduledata);
@ -519,7 +521,7 @@ check_forward(struct Client *source_p, struct Channel *chptr,
if(MyClient(source_p) && !(targptr->mode.mode & MODE_FREETARGET))
{
if((msptr = find_channel_membership(targptr, source_p)) == NULL ||
get_channel_access(source_p, msptr, MODE_QUERY) != CHFL_CHANOP)
get_channel_access(source_p, msptr, MODE_QUERY, NULL) != CHFL_CHANOP)
{
sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
me.name, source_p->name, targptr->chname);
@ -1655,7 +1657,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
else
fakesource_p = source_p;
alevel = get_channel_access(source_p, msptr, dir);
alevel = get_channel_access(source_p, msptr, dir, reconstruct_parv(parc, parv));
for(; (c = *ml) != 0; ml++)
{
@ -1665,7 +1667,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
dir = MODE_ADD;
if (!reauthorized)
{
alevel = get_channel_access(source_p, msptr, dir);
alevel = get_channel_access(source_p, msptr, dir, reconstruct_parv(parc, parv));
reauthorized = 1;
}
break;
@ -1673,7 +1675,7 @@ set_channel_mode(struct Client *client_p, struct Client *source_p,
dir = MODE_DEL;
if (!reauthorized)
{
alevel = get_channel_access(source_p, msptr, dir);
alevel = get_channel_access(source_p, msptr, dir, reconstruct_parv(parc, parv));
reauthorized = 1;
}
break;

2
modules/core/m_kick.c
View file

@ -97,7 +97,7 @@ m_kick(struct Client *client_p, struct Client *source_p, int parc, const char *p
return 0;
}
if(get_channel_access(source_p, msptr, MODE_ADD) < CHFL_CHANOP)
if(get_channel_access(source_p, msptr, MODE_ADD, NULL) < CHFL_CHANOP)
{
if(MyConnect(source_p))
{

2
modules/m_topic.c
View file

@ -119,7 +119,7 @@ m_topic(struct Client *client_p, struct Client *source_p, int parc, const char *
}
if(((chptr->mode.mode & MODE_TOPICLIMIT) == 0 ||
get_channel_access(source_p, msptr, MODE_ADD) >= CHFL_CHANOP) &&
get_channel_access(source_p, msptr, MODE_ADD, NULL) >= CHFL_CHANOP) &&
(!MyClient(source_p) ||
can_send(chptr, source_p, msptr)))
{