Make auto-accept on message conditional on oper:always_message, not oper:general...

diff --git a/modules/um_callerid.c b/modules/um_callerid.c
index 74d4ce3b038b2201b8261d77e1e8c6c4f91130c3..b9410b02dcde4826a5192549b1d894872845c442 100644 (file)
--- 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)