From 9fdbdf7692d3bffefa4718aee5ca0e0ec76680da Mon Sep 17 00:00:00 2001
From: Matthew Saunders Brown <msb@stackaas.com>
Date: Sat, 20 Nov 2021 15:34:43 -0800
Subject: [PATCH] added checks for junk filtering

---
 etc/exim4/exim4.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/exim4/exim4.conf b/etc/exim4/exim4.conf
index c80daf9..c457952 100644
--- a/etc/exim4/exim4.conf
+++ b/etc/exim4/exim4.conf
@@ -725,7 +725,7 @@ junk_filter:
   local_part_suffix = +*
   local_part_suffix_optional = true
   condition = ${if eq {$header_X-Junk-Flag:}{YES}}
-  condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1'}}
+  condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1' AND vm_mboxes.filter > '0'}}
   transport = junk_delivery
 
 spam_filter:
@@ -737,7 +737,7 @@ spam_filter:
               { eq {$received_protocol}{spam-scanned}} \
               { eq {$header_X-Spam-Flag:}{YES}} \
               } {yes}{no}}
-  condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1'}}
+  condition = ${lookup mysql{SELECT vm_mboxes.id FROM vm_domains, vm_mboxes WHERE vm_domains.domain='${domain}' AND vm_mboxes.mbox='${local_part}' AND vm_domains.id = vm_mboxes.domain_id AND vm_domains.status = '1' AND vm_mboxes.status = '1' AND vm_mboxes.filter = '2'}}
   transport = junk_delivery
 
 virtual_vacation: