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

add separate priv (oper:message) for walking over CALLERID (umode +g) (#152)

Browse source
This commit is contained in:
jess 2021-04-26 17:24:36 +01:00 committed by GitHub
parent 4cac091255
commit 64d5cff464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/ircd.conf.example
View file

@ -231,8 +231,8 @@ auth {
* means they must be defined before operator {}. * means they must be defined before operator {}.
*/ */
privset "local_op" { privset "local_op" {
privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, usermode:servnotice, privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, oper:message,
auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes; usermode:servnotice, auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes;
}; };
privset "server_bot" { privset "server_bot" {

5
doc/reference.conf
View file

@ -458,6 +458,7 @@ privset "local_op" {
* oper:wallops: allows sending wallops messages * oper:wallops: allows sending wallops messages
* oper:grant: allows using the GRANT command * oper:grant: allows using the GRANT command
* usermode:servnotice: allows setting +s * usermode:servnotice: allows setting +s
* oper:message: allows opers to bypass CALLERID (usermode +g)
* *
* Privileges provided by extensions include: * Privileges provided by extensions include:
* *
@ -467,8 +468,8 @@ privset "local_op" {
* confers the benefits of chmode +M (operpeace) (from extensions/chm_operpeace) * confers the benefits of chmode +M (operpeace) (from extensions/chm_operpeace)
* usermode:helpops allows setting +h (from extensions/helpops) * usermode:helpops allows setting +h (from extensions/helpops)
*/ */
privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, usermode:servnotice, privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, oper:message,
auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes; usermode:servnotice, auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes;
}; };
privset "server_bot" { privset "server_bot" {

2
modules/um_callerid.c
View file

@ -103,7 +103,7 @@ allow_message(struct Client *source_p, struct Client *target_p)
return true; return true;
/* XXX: controversial? allow opers to send through +g */ /* XXX: controversial? allow opers to send through +g */
if (IsOperGeneral(source_p)) if (HasPrivilege(source_p, "oper:message"))
return true; return true;
if (accept_message(source_p, target_p)) if (accept_message(source_p, target_p))