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

callerid: only check the target's accept list on their own local server

Browse source
This commit is contained in:
Ariadne Conill 2020-06-27 16:10:29 +00:00
parent 3ed61fba8c
commit 4841ad6197
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/um_callerid.c
View file

@ -154,6 +154,10 @@ send_callerid_notice(enum message_type msgtype, struct Client *source_p, struct
static bool static bool
add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_p, struct Client *target_p) add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_p, struct Client *target_p)
{ {
/* only do this on target_p's server */
if (!MyClient(target_p))
return true;
/* /*
* XXX: Controversial? Allow target users to send replies * XXX: Controversial? Allow target users to send replies
* through a +g. Rationale is that people can presently use +g * through a +g. Rationale is that people can presently use +g
@ -161,9 +165,9 @@ add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_
* as a way of griefing. --nenolod * as a way of griefing. --nenolod
*/ */
if(msgtype != MESSAGE_TYPE_NOTICE && if(msgtype != MESSAGE_TYPE_NOTICE &&
IsSetCallerID(source_p) && IsSetCallerID(source_p) &&
!accept_message(target_p, source_p) && !accept_message(target_p, source_p) &&
!IsOper(target_p)) !IsOper(target_p))
{ {
if(rb_dlink_list_length(&source_p->localClient->allow_list) < if(rb_dlink_list_length(&source_p->localClient->allow_list) <
(unsigned long)ConfigFileEntry.max_accept) (unsigned long)ConfigFileEntry.max_accept)