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

override: always check oper:override

Browse source 
It's possible to have the oper:override privilege removed by /grant.
/grant triggers an empty umode change event to allow privileged umodes
to be set or removed, so checking for oper:override on all umode changes
(and not just ones where +o or +p is changed) allows us to remove +p
when necessary.
This commit is contained in:
Ed Kellett 2019-07-27 13:50:53 +01:00
parent 6637a54728
commit dbeda234e6
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
extensions/override.c
View file

@ -108,6 +108,7 @@ static void
check_umode_change(void *vdata) check_umode_change(void *vdata)
{ {
hook_data_umode_changed *data = (hook_data_umode_changed *)vdata; hook_data_umode_changed *data = (hook_data_umode_changed *)vdata;
bool changed = false;
struct Client *source_p = data->client; struct Client *source_p = data->client;
if (!MyClient(source_p)) if (!MyClient(source_p))
@ -116,9 +117,7 @@ check_umode_change(void *vdata)
if (data->oldumodes & UMODE_OPER && !IsOper(source_p)) if (data->oldumodes & UMODE_OPER && !IsOper(source_p))
source_p->umodes &= ~user_modes['p']; source_p->umodes &= ~user_modes['p'];
/* didn't change +p umode, we don't need to do anything */ changed = ((data->oldumodes ^ source_p->umodes) & user_modes['p']);
if (!((data->oldumodes ^ source_p->umodes) & user_modes['p']))
return;
if (source_p->umodes & user_modes['p']) if (source_p->umodes & user_modes['p'])
{ {
@ -129,12 +128,14 @@ check_umode_change(void *vdata)
return; return;
} }
update_session_deadline(source_p, NULL); if (changed)
{
sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has enabled oper-override (+p)", update_session_deadline(source_p, NULL);
get_oper_name(source_p)); sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has enabled oper-override (+p)",
get_oper_name(source_p));
}
} }
else if (!(source_p->umodes & user_modes['p'])) else if (changed && !(source_p->umodes & user_modes['p']))
{ {
rb_dlink_node *n, *tn; rb_dlink_node *n, *tn;