Merge pull request hestiacp#178 from exaexa/dnsbl-vs-login-fix

Exim ACL fix: act correctly on DNSBL+authentication

Author: serghey-rodin

install/debian/exim4.conf.template

@@ -51,8 +51,6 @@ acl_check_spammers:
   drop    message       = Your host in blacklist on this server.
           log_message   = Host in blacklist
           hosts         = +spammers
-  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
-          dnslists      = ${readfile {/etc/exim4/dnsbl.conf}{:}}
   accept
 
 acl_check_mail:
@@ -102,6 +100,10 @@ acl_check_rcpt:
   accept  authenticated = *
           control       = submission/domain=
 
+  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
+	  hosts		= !+whitelist
+          dnslists      = ${readfile {/etc/exim4/dnsbl.conf}{:}}
+
   require message       = relay not permitted
           domains       = +local_domains : +relay_to_domains
 

install/rhel/exim-smarthost.conf

@@ -51,8 +51,6 @@ acl_check_spammers:
   drop    message       = Your host in blacklist on this server.
           log_message   = Host in blacklist
           hosts         = +spammers
-  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
-          dnslists      = ${readfile {/etc/exim/dnsbl.conf}{:}}
   accept
 
 acl_check_mail:
@@ -102,6 +100,10 @@ acl_check_rcpt:
   accept  authenticated = *
           control       = submission/domain=
 
+  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
+          hosts		= !+whitelist
+          dnslists      = ${readfile {/etc/exim/dnsbl.conf}{:}}
+
   require message       = relay not permitted
           domains       = +local_domains : +relay_to_domains
 

install/rhel/exim.conf

@@ -51,8 +51,6 @@ acl_check_spammers:
   drop    message       = Your host in blacklist on this server.
           log_message   = Host in blacklist
           hosts         = +spammers
-  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
-          dnslists      = ${readfile {/etc/exim/dnsbl.conf}{:}}
   accept
 
 acl_check_mail:
@@ -102,6 +100,10 @@ acl_check_rcpt:
   accept  authenticated = *
           control       = submission/domain=
 
+  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
+	  hosts		= !+whitelist
+          dnslists      = ${readfile {/etc/exim/dnsbl.conf}{:}}
+
   require message       = relay not permitted
           domains       = +local_domains : +relay_to_domains
 

install/ubuntu/exim4.conf.template

@@ -51,8 +51,6 @@ acl_check_spammers:
   drop    message       = Your host in blacklist on this server.
           log_message   = Host in blacklist
           hosts         = +spammers
-  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
-          dnslists      = ${readfile {/etc/exim4/dnsbl.conf}{:}}
   accept
 
 acl_check_mail:
@@ -102,6 +100,10 @@ acl_check_rcpt:
   accept  authenticated = *
           control       = submission/domain=
 
+  deny    message       = rejected because $sender_host_address is in a black list at $dnslist_domain\\n$dnslist_text
+	  hosts		= !+whitelist
+          dnslists      = ${readfile {/etc/exim4/dnsbl.conf}{:}}
+
   require message       = relay not permitted
           domains       = +local_domains : +relay_to_domains