From 20502fc5a2b6918d1c3b4bd02f016c47919bb2be Mon Sep 17 00:00:00 2001 From: Doug Freed Date: Tue, 23 Aug 2022 12:34:04 +0000 Subject: [PATCH 1/2] um_callerid, um_regonlymsg: use allow_message for reverse auto-/accept This should eliminate some unnecessary /accept list entries because reverse messages would have been allowed anyway. Also fixes opers not getting added to source's /accept list with the new mode to bypass callerid. --- modules/um_callerid.c | 4 +--- modules/um_regonlymsg.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/um_callerid.c b/modules/um_callerid.c index 74d4ce3b0..2f36a39fc 100644 --- a/modules/um_callerid.c +++ b/modules/um_callerid.c @@ -182,9 +182,7 @@ add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_ * as a way of griefing. --nenolod */ if(msgtype != MESSAGE_TYPE_NOTICE && - IsSetAnyCallerID(source_p) && - !accept_message(target_p, source_p) && - !IsOperGeneral(target_p)) + !allow_message(target_p, source_p)) { if(rb_dlink_list_length(&source_p->localClient->allow_list) < (unsigned long)ConfigFileEntry.max_accept) diff --git a/modules/um_regonlymsg.c b/modules/um_regonlymsg.c index a4056b2cc..2c81b99f2 100644 --- a/modules/um_regonlymsg.c +++ b/modules/um_regonlymsg.c @@ -101,9 +101,7 @@ add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_ return true; if(msgtype != MESSAGE_TYPE_NOTICE && - IsSetRegOnlyMsg(source_p) && - !accept_message(target_p, source_p) && - !IsOperGeneral(target_p)) + !allow_message(target_p, source_p)) { if(rb_dlink_list_length(&source_p->localClient->allow_list) < (unsigned long)ConfigFileEntry.max_accept) From d27fba3da38122d9698844ec0db799d84e1872e7 Mon Sep 17 00:00:00 2001 From: Doug Freed Date: Tue, 23 Aug 2022 12:45:43 +0000 Subject: [PATCH 2/2] um_regonlymsg: check source identified before scanning /accept list --- modules/um_regonlymsg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/um_regonlymsg.c b/modules/um_regonlymsg.c index 2c81b99f2..579e00439 100644 --- a/modules/um_regonlymsg.c +++ b/modules/um_regonlymsg.c @@ -85,10 +85,10 @@ allow_message(struct Client *source_p, struct Client *target_p) if (IsOper(source_p)) return true; - if (accept_message(source_p, target_p)) + if (source_p->user->suser[0]) return true; - if (source_p->user->suser[0]) + if (accept_message(source_p, target_p)) return true; return false;