Automated merge with ssh://taros@hg.atheme.org//hg/unofficial/shadowircd

[irc/rqf/shadowircd.git] / modules / core / m_message.c

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index e5505c2d64311ddee14ad89024309efa0dc69196..46ba4e9ffb547a67d24eb2e8b8324b027832e9d0 100644 (file)
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -762,6 +762,7 @@ msg_client(int p_or_n, const char *command,
                 */
                if(p_or_n != NOTICE && MyClient(source_p) &&
                                IsSetCallerId(source_p) &&
+                               IsSetSCallerId(source_p) &&
                                !accept_message(target_p, source_p))
                {
                        if(rb_dlink_list_length(&source_p->localClient->allow_list) <