* Fix distance calculation for common recipients

diff --git a/conf/headers.inc b/conf/headers.inc
index a7bf9ccd9e9e4fa3a38ee7fff86eb9963f56dce3..d7c2d2f4d6de632619568a878a4026fe644acf8f 100644 (file)
--- a/conf/headers.inc
+++ b/conf/headers.inc
@@ -76,7 +76,7 @@ $__YAHOO_BULK="Received=/from \[\S+\] by \S+\.(?:groups|scd|dcn)\.yahoo\.com wit
 $__ANY_OUTLOOK_MUA="X-Mailer=/^Microsoft Outlook\b/H";
 $MIME_HTML_ONLY="has_only_html_part()";
 $FORGED_OUTLOOK_HTML="!${__YAHOO_BULK} & ${__ANY_OUTLOOK_MUA} & ${MIME_HTML_ONLY}";
-$SUSPICIOUS_RECIPS="compare_recipients_distance(0.65)";
+$SUSPICIOUS_RECIPS="compare_recipients_distance(0.85)";
 $SORTED_RECIPS="is_recipients_sorted()";
 $TRACKER_ID="/^[a-z0-9]{6,24}[-_a-z0-9]{2,36}[a-z0-9]{6,24}\s*\z/isPr";
 $__FROM_ENCODED_B64="From=/\=\?\S+\?B\?/iX";

diff --git a/src/expressions.c b/src/expressions.c
index 73db179fe8d4e2b43cab0f559d5a12db53b6ac65..13b426ec7dca2b5a7ddeed70685767b2a0e4b239 100644 (file)
--- a/src/expressions.c
+++ b/src/expressions.c
@@ -1202,7 +1202,7 @@ rspamd_recipients_distance (struct worker_task *task, GList *args)
                }
        }
 
-       if ((double)total / (double)hits >= threshold) {
+       if ((double)(hits * num / 2.) / (double)total >= threshold) {
                return TRUE;
        }