Merge hcoop user .forward rules

[hcoop/zz_old/config/exim4-hopper.git] / conf.d / acl / 40_exim4-config_check_data

diff --git a/conf.d/acl/40_exim4-config_check_data b/conf.d/acl/40_exim4-config_check_data
index 5f8f25b..958639d 100644 (file)
--- a/conf.d/acl/40_exim4-config_check_data
+++ b/conf.d/acl/40_exim4-config_check_data
@@ -14,7 +14,7 @@ acl_check_data:
   .ifdef CHECK_DATA_VERIFY_HEADER_SYNTAX
   deny
     message = Message headers fail syntax check
-    !acl = acl_whitelist_local_deny
+    !acl = acl_local_deny_exceptions
     !verify = header_syntax
   .endif
 
@@ -24,7 +24,7 @@ acl_check_data:
   .ifdef CHECK_DATA_VERIFY_HEADER_SENDER
   deny
     message = No verifiable sender address in message headers
-    !acl = acl_whitelist_local_deny
+    !acl = acl_local_deny_exceptions
     !verify = header_sender
   .endif
 
@@ -61,15 +61,6 @@ acl_check_data:
   #             X-Spam_bar: $spam_bar\n\
   #             X-Spam_report: $spam_report
 
-  # hcoop-change: Our more-competent solution
-  warn
-    # Only run through spamassassin if the user wants this
-    condition = ${if exists{/etc/spamassassin/addrs/${local_part}@${domain}}\
-                     {yes}{no}}
-    spam = nobody:true
-    add_header = X-Spam-Score: $spam_score ($spam_bar)
-    add_header = X-Spam-Report: $spam_report
-
 
   # This hook allows you to hook in your own ACLs without having to
   # modify this file. If you do it like we suggest, you'll end up with