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

kick,remove: don't confuse source and target membership

Browse source
This commit is contained in:
Ed Kellett 2021-07-13 15:13:47 +01:00
parent b9a7173ab5
commit 883ac66b20
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extensions/m_remove.c
View file

@ -67,7 +67,7 @@ DECLARE_MODULE_AV2(remove, NULL, NULL, remove_clist, NULL, remove_hfnlist, remov
static void static void
m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
struct membership *msptr; struct membership *sourcems, *targetms;
struct Client *who; struct Client *who;
struct Channel *chptr; struct Channel *chptr;
int chasing = 0; int chasing = 0;
@ -95,16 +95,16 @@ m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
if(!IsServer(source_p)) if(!IsServer(source_p))
{ {
msptr = find_channel_membership(chptr, source_p); sourcems = find_channel_membership(chptr, source_p);
if((msptr == NULL) && MyConnect(source_p)) if((sourcems == NULL) && MyConnect(source_p))
{ {
sendto_one_numeric(source_p, ERR_NOTONCHANNEL, sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
form_str(ERR_NOTONCHANNEL), name); form_str(ERR_NOTONCHANNEL), name);
return; return;
} }
if(get_channel_access(source_p, chptr, msptr, MODE_ADD, NULL) < CHFL_CHANOP) if(get_channel_access(source_p, chptr, sourcems, MODE_ADD, NULL) < CHFL_CHANOP)
{ {
if(MyConnect(source_p)) if(MyConnect(source_p))
{ {
@ -154,9 +154,9 @@ m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
return; return;
} }
msptr = find_channel_membership(chptr, who); targetms = find_channel_membership(chptr, who);
if(msptr != NULL) if(targetms != NULL)
{ {
if(MyClient(source_p) && IsService(who)) if(MyClient(source_p) && IsService(who))
{ {
@ -171,7 +171,7 @@ m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
hookdata.client = source_p; hookdata.client = source_p;
hookdata.chptr = chptr; hookdata.chptr = chptr;
hookdata.msptr = msptr; hookdata.msptr = sourcems;
hookdata.target = who; hookdata.target = who;
hookdata.approved = 1; hookdata.approved = 1;
hookdata.dir = MODE_ADD; /* ensure modules like override speak up */ hookdata.dir = MODE_ADD; /* ensure modules like override speak up */
@ -205,7 +205,7 @@ m_remove(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
":%s KICK %s %s :%s", ":%s KICK %s %s :%s",
use_id(source_p), chptr->chname, use_id(who), comment); use_id(source_p), chptr->chname, use_id(who), comment);
remove_user_from_channel(msptr); remove_user_from_channel(targetms);
} }
else if (MyClient(source_p)) else if (MyClient(source_p))
sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL, sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,

16
modules/core/m_kick.c
View file

@ -60,7 +60,7 @@ DECLARE_MODULE_AV2(kick, NULL, NULL, kick_clist, NULL, NULL, NULL, NULL, kick_de
static void static void
m_kick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) m_kick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
struct membership *msptr; struct membership *sourcems, *targetms;
struct Client *who; struct Client *who;
struct Channel *chptr; struct Channel *chptr;
int chasing = 0; int chasing = 0;
@ -88,16 +88,16 @@ m_kick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
if(!IsServer(source_p)) if(!IsServer(source_p))
{ {
msptr = find_channel_membership(chptr, source_p); sourcems = find_channel_membership(chptr, source_p);
if((msptr == NULL) && MyConnect(source_p)) if((sourcems == NULL) && MyConnect(source_p))
{ {
sendto_one_numeric(source_p, ERR_NOTONCHANNEL, sendto_one_numeric(source_p, ERR_NOTONCHANNEL,
form_str(ERR_NOTONCHANNEL), name); form_str(ERR_NOTONCHANNEL), name);
return; return;
} }
if(get_channel_access(source_p, chptr, msptr, MODE_ADD, NULL) < CHFL_CHANOP) if(get_channel_access(source_p, chptr, sourcems, MODE_ADD, NULL) < CHFL_CHANOP)
{ {
if(MyConnect(source_p)) if(MyConnect(source_p))
{ {
@ -127,9 +127,9 @@ m_kick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
return; return;
} }
msptr = find_channel_membership(chptr, who); targetms = find_channel_membership(chptr, who);
if(msptr != NULL) if(targetms != NULL)
{ {
if(MyClient(source_p) && IsService(who)) if(MyClient(source_p) && IsService(who))
{ {
@ -144,7 +144,7 @@ m_kick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
hookdata.client = source_p; hookdata.client = source_p;
hookdata.chptr = chptr; hookdata.chptr = chptr;
hookdata.msptr = msptr; hookdata.msptr = sourcems;
hookdata.target = who; hookdata.target = who;
hookdata.approved = 1; hookdata.approved = 1;
hookdata.dir = MODE_ADD; /* ensure modules like override speak up */ hookdata.dir = MODE_ADD; /* ensure modules like override speak up */
@ -178,7 +178,7 @@ m_kick(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
sendto_server(client_p, chptr, CAP_TS6, NOCAPS, sendto_server(client_p, chptr, CAP_TS6, NOCAPS,
":%s KICK %s %s :%s", ":%s KICK %s %s :%s",
use_id(source_p), chptr->chname, use_id(who), comment); use_id(source_p), chptr->chname, use_id(who), comment);
remove_user_from_channel(msptr); remove_user_from_channel(targetms);
} }
else if (MyClient(source_p)) else if (MyClient(source_p))
sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL, sendto_one_numeric(source_p, ERR_USERNOTINCHANNEL,