From ed775e9bb45171353f68e30513986659eb483679 Mon Sep 17 00:00:00 2001 From: Stephen Bennett Date: Thu, 3 Nov 2022 14:43:59 +0000 Subject: [PATCH] Make auto-accept on message conditional on oper:always_message, not oper:general. This updates the test to match current behaviour of +g --- modules/um_callerid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/um_callerid.c b/modules/um_callerid.c index 74d4ce3b..b9410b02 100644 --- 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)