merge hcoop domain routing changes

diff --git a/conf.d/acl/30_exim4-config_check_rcpt b/conf.d/acl/30_exim4-config_check_rcpt
index 41682eb..5a9f168 100644 (file)
--- a/conf.d/acl/30_exim4-config_check_rcpt
+++ b/conf.d/acl/30_exim4-config_check_rcpt
@@ -53,7 +53,7 @@ acl_check_rcpt:
   # broad range of non-alphanumeric characters.
   .ifdef CHECK_RCPT_LOCAL_LOCALPARTS
   deny
   # broad range of non-alphanumeric characters.
   .ifdef CHECK_RCPT_LOCAL_LOCALPARTS
   deny

-    domains = +local_domains
+    domains = +local_domains : +unix_domains

     local_parts = CHECK_RCPT_LOCAL_LOCALPARTS
     message = restricted characters in address
   .endif
     local_parts = CHECK_RCPT_LOCAL_LOCALPARTS
     message = restricted characters in address
   .endif


@@ -77,7 +77,7 @@ acl_check_rcpt:
   # from mounting certain kinds of attack on remote sites.
   .ifdef CHECK_RCPT_REMOTE_LOCALPARTS
   deny
   # from mounting certain kinds of attack on remote sites.
   .ifdef CHECK_RCPT_REMOTE_LOCALPARTS
   deny

-    domains = !+local_domains
+    domains = !+local_domains : !+unix_domains

     local_parts = CHECK_RCPT_REMOTE_LOCALPARTS
     message = restricted characters in address
   .endif
     local_parts = CHECK_RCPT_REMOTE_LOCALPARTS
     message = restricted characters in address
   .endif


@@ -92,7 +92,7 @@ acl_check_rcpt:
     .else
     local_parts = CHECK_RCPT_POSTMASTER
     .endif
     .else
     local_parts = CHECK_RCPT_POSTMASTER
     .endif

-    domains = +local_domains : +relay_to_domains
+    domains = +local_domains : +unix_domains : +relay_to_domains

 
 
   # Deny unless the sender address can be verified.
 
 
   # Deny unless the sender address can be verified.


@@ -162,7 +162,7 @@ acl_check_rcpt:
   # relaying. Any other domain is rejected as being unacceptable for relaying.
   require
     message = relay not permitted
   # relaying. Any other domain is rejected as being unacceptable for relaying.
   require
     message = relay not permitted

-    domains = +local_domains : +relay_to_domains
+    domains = +local_domains : +unix_domains : +relay_to_domains

 
 
   # We also require all accepted addresses to be verifiable. This check will
 
 
   # We also require all accepted addresses to be verifiable. This check will