Merge branch 'master' of git://git.exim.org/exim

[exim.git] / src / src / configure.default

diff --git a/src/src/configure.default b/src/src/configure.default
index 55de5cb5a644fc81e194c7e3c4e330c61c6f8467..73fbc0ce8130bdc17ff49d2a56b88ef38d2d72d0 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -1,4 +1,4 @@
-# $Cambridge: exim/src/src/configure.default,v 1.13 2007/06/26 11:21:36 ph10 Exp $
+# $Cambridge: exim/src/src/configure.default,v 1.15 2010/06/03 08:19:13 pdp Exp $
 
 ######################################################################
 #                  Runtime configuration file for Exim               #
@@ -291,6 +291,20 @@ timeout_frozen_after = 7d
 # split_spool_directory = true
 
 
+# If you're in a part of the world where ASCII is not sufficient for most
+# text, then you're probably familiar with RFC2047 message header extensions.
+# By default, Exim adheres to the specification, including a limit of 76
+# characters to a line, with encoded words fitting within a line.
+# If you wish to use decoded headers in message filters in such a way
+# that successful decoding of malformed messages matters, you may wish to
+# configure Exim to be more lenient.
+#
+# check_rfc2047_length = false
+#
+# In particular, the Exim maintainers have had multiple reports of problems
+# from Russian administrators of issues until they disable this check,
+# because of some popular, yet buggy, mail composition software.
+
 
 ######################################################################
 #                       ACL CONFIGURATION                            #
@@ -309,6 +323,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 +402,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,6 +411,7 @@ 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