Make auto-accept on message conditional on oper:always_message, not oper:general. This updates the test to match current behaviour of +g

spb · web-flow · commit ed775e9bb451 · 2022-11-03T14:43:59.000Z
diff --git a/modules/um_callerid.c b/modules/um_callerid.c
@@ -184,7 +184,7 @@ add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_
 	if(msgtype != MESSAGE_TYPE_NOTICE &&
 		IsSetAnyCallerID(source_p) &&
 		!accept_message(target_p, source_p) &&
-		!IsOperGeneral(target_p))
+		!MayHavePrivilege(source_p, "oper:always_message"))
 	{
 		if(rb_dlink_list_length(&source_p->localClient->allow_list) <
 				(unsigned long)ConfigFileEntry.max_accept)

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_`
`184`	`184`	`if(msgtype != MESSAGE_TYPE_NOTICE &&`
`185`	`185`	`IsSetAnyCallerID(source_p) &&`
`186`	`186`	`!accept_message(target_p, source_p) &&`
`187`		`- !IsOperGeneral(target_p))`
	`187`	`+ !MayHavePrivilege(source_p, "oper:always_message"))`
`188`	`188`	`{`
`189`	`189`	`if(rb_dlink_list_length(&source_p->localClient->allow_list) <`
`190`	`190`	`(unsigned long)ConfigFileEntry.max_accept)`