Add unix_domains to several places where local_domains are used.

This fixes some weirdness that occurs when hcoop.net is not present in
local_domains, and adds a guarantee that even if domtool screws up badly,
we can still deliver to USER@hcoop.net.

diff --git a/conf.d/acl/30_exim4-config_check_rcpt b/conf.d/acl/30_exim4-config_check_rcpt
index ac8bc53..c8a6660 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
-    domains = +local_domains
+    domains = +local_domains : +unix_domains
     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
-    domains = !+local_domains
+    domains = !+local_domains : !+unix_domains
     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
-    domains = +local_domains : +relay_to_domains
+    domains = +local_domains : +unix_domains : +relay_to_domains
 
 
   # Deny unless the sender address can be verified.
@@ -182,7 +182,7 @@ acl_check_rcpt:
   # 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

diff --git a/conf.d/router/200_exim4-config_primary b/conf.d/router/200_exim4-config_primary
index 8b2bafb..8025e2a 100644 (file)
--- a/conf.d/router/200_exim4-config_primary
+++ b/conf.d/router/200_exim4-config_primary
@@ -16,7 +16,7 @@
 dnslookup_relay_to_domains:
   debug_print = "R: dnslookup_relay_to_domains for $local_part@$domain"
   driver = dnslookup
-  domains = ! +local_domains : +relay_to_domains
+  domains = ! +local_domains : ! +unix_domains : +relay_to_domains
   transport = remote_smtp
   same_domain_copy_routing = yes
   no_more
@@ -29,7 +29,7 @@ dnslookup_relay_to_domains:
 dnslookup:
   debug_print = "R: dnslookup for $local_part@$domain"
   driver = dnslookup
-  domains = ! +local_domains
+  domains = ! +local_domains : ! +unix_domains
   transport = remote_smtp
   same_domain_copy_routing = yes
   # ignore private rfc1918 and APIPA addresses

diff --git a/conf.d/router/mmm_mail4root b/conf.d/router/mmm_mail4root
index 88017ba..af6206e 100644 (file)
--- a/conf.d/router/mmm_mail4root
+++ b/conf.d/router/mmm_mail4root
@@ -8,7 +8,7 @@
 mail4root:
   debug_print = "R: mail4root for $local_part@$domain"
   driver = redirect
-  domains = +local_domains
+  domains = +local_domains : +unix_domains
   data = /var/mail/mail
   file_transport = address_file
   local_parts = root