--- 1.29/check_message.conf 2019-10-17 15:55:56.704768836 -0600 +++ 1.31/check_message.conf 2019-11-19 16:21:23.851629876 -0700 @@ -16,6 +16,7 @@ #SpamAssassin warn condition = ${if !eq{$acl_c_rspamd}{1}} + condition = ${if !eq{$acl_c_esf_skip}{1}} condition = ${if and { {< {$message_size}{EASY_SPAMASSASSIN_MAX_SIZE}} { <{$acl_m_easy69}{EASY_LIMIT}}}{1}{0}} condition = ${if !eq{$acl_m_spam_user}{nobody}} set acl_m_spam_assassin_has_run = 1 @@ -27,6 +28,7 @@ warn condition = ${if !eq{$acl_c_rspamd}{1}} + condition = ${if !eq{$acl_c_esf_skip}{1}} condition = ${if < {$message_size}{EASY_SPAMASSASSIN_MAX_SIZE}} condition = ${if !eq{$acl_m_spam_user}{nobody}} spam = $acl_m_spam_user/defer_ok @@ -66,7 +68,7 @@ warn remove_header = SpamTally condition = ${if eq{$acl_m_spam_user}{nobody}} - add_header = SpamTally: Final spam score: unset because ESF not run (SpamAssassin unset, whitelist, or skippped) + add_header = SpamTally: Final spam score: unset because ESF not run (SpamAssassin unset, whitelist, or skipped) drop condition = ${if !eq{$acl_c_esf_skip}{1}}