callerid: only check the target's accept list on their own local server

diff --git a/modules/um_callerid.c b/modules/um_callerid.c
index 943b58a9dd19af231d0daddd9668dd4863551bdd..bbe70d3ccae843f6a06d126f832772e9b4a68148 100644 (file)
--- a/modules/um_callerid.c
+++ b/modules/um_callerid.c
@@ -154,6 +154,10 @@ send_callerid_notice(enum message_type msgtype, struct Client *source_p, struct
 static bool
 add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_p, struct Client *target_p)
 {
+       /* only do this on target_p's server */
+       if (!MyClient(target_p))
+               return true;
+
        /*
         * XXX: Controversial? Allow target users to send replies
         * through a +g.  Rationale is that people can presently use +g
@@ -161,9 +165,9 @@ add_callerid_accept_for_source(enum message_type msgtype, struct Client *source_
         * as a way of griefing.  --nenolod
         */
        if(msgtype != MESSAGE_TYPE_NOTICE &&
-                       IsSetCallerID(source_p) &&
-                       !accept_message(target_p, source_p) &&
-                       !IsOper(target_p))
+               IsSetCallerID(source_p) &&
+               !accept_message(target_p, source_p) &&
+               !IsOper(target_p))
        {
                if(rb_dlink_list_length(&source_p->localClient->allow_list) <
                                (unsigned long)ConfigFileEntry.max_accept)