X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/92db8b2d0f0ff060769b2fd82ee7980f0f673170..0a49a7a4f1090b6f1ce1d0f9d969804c9226b53e:/src/src/configure.default

diff --git a/src/src/configure.default b/src/src/configure.default
index 5b6f11af0..881a22b20 100644
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/configure.default,v 1.11 2006/09/26 13:51:00 ph10 Exp $
+# $Cambridge: exim/src/src/configure.default,v 1.14 2009/10/16 07:46:13 tom Exp $
 
 ######################################################################
 #                  Runtime configuration file for Exim               #
@@ -309,6 +309,7 @@ acl_check_rcpt:
   # testing for an empty sending host field.
 
   accept  hosts = :
+          control = dkim_disable_verify
 
   #############################################################################
   # The following section of the ACL is concerned with local parts that contain
@@ -387,6 +388,7 @@ acl_check_rcpt:
 
   accept  hosts         = +relay_from_hosts
           control       = submission
+          control       = dkim_disable_verify
 
   # Accept if the message arrived over an authenticated connection, from
   # any host. Again, these messages are usually from MUAs, so recipient
@@ -395,13 +397,14 @@ acl_check_rcpt:
 
   accept  authenticated = *
           control       = submission
+          control       = dkim_disable_verify
 
   # Insist that any other recipient address that we accept is either in one of
   # our local domains, or is in a domain for which we explicitly allow
   # relaying. Any other domain is rejected as being unacceptable for relaying.
 
   require message = relay not permitted
-          domains = +local_domains : +relay_domains
+          domains = +local_domains : +relay_to_domains
 
   # We also require all accepted addresses to be verifiable. This check will
   # do local part verification for local domains, but only check the domain
@@ -690,6 +693,12 @@ begin retry
 # hours, then retries every 6 hours until 4 days have passed since the first
 # failed delivery.
 
+# WARNING: If you do not have any retry rules at all (this section of the
+# configuration is non-existent or empty), Exim will not do any retries of
+# messages that fail to get delivered at the first attempt. The effect will
+# be to treat temporary errors as permanent. Therefore, DO NOT remove this
+# retry rule unless you really don't want any retries.
+
 # Address or Domain    Error       Retries
 # -----------------    -----       -------