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

um_callerid: Only people can have common channels

Browse source
This commit is contained in:
Ed Kellett 2021-06-24 18:20:37 +01:00
parent 4da55c14c0
commit ad0bbd9b3d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/um_callerid.c
View file

@ -96,10 +96,12 @@ allow_message(struct Client *source_p, struct Client *target_p)
if (!IsSetAnyCallerID(target_p)) if (!IsSetAnyCallerID(target_p))
return true; return true;
if (IsSetRelaxedCallerID(target_p) && has_common_channel(source_p, target_p) && !IsSetStrictCallerID(target_p)) if (!IsPerson(source_p))
return true; return true;
if (IsServer(source_p)) if (IsSetRelaxedCallerID(target_p) &&
!IsSetStrictCallerID(target_p) &&
has_common_channel(source_p, target_p))
return true; return true;
/* XXX: controversial? allow opers to send through +g */ /* XXX: controversial? allow opers to send through +g */

2
modules/um_regonlymsg.c
View file

@ -78,7 +78,7 @@ allow_message(struct Client *source_p, struct Client *target_p)
if (!IsSetRegOnlyMsg(target_p)) if (!IsSetRegOnlyMsg(target_p))
return true; return true;
if (IsServer(source_p)) if (!IsPerson(source_p))
return true; return true;
/* XXX: controversial? allow opers to send through +R */ /* XXX: controversial? allow opers to send through +R */