Drop server_realm from heimdal_gssapi

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

diff --git a/src/src/configure.default b/src/src/configure.default
index 5b6f11af0f3ee7263b8e4f9fbc5a649185dfe13c..a527b41a85fdf0304d92f00f196c395c9f94c2b5 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -1,5 +1,3 @@
-# $Cambridge: exim/src/src/configure.default,v 1.11 2006/09/26 13:51:00 ph10 Exp $
-
 ######################################################################
 #                  Runtime configuration file for Exim               #
 ######################################################################
@@ -291,6 +289,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 +321,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 +400,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 +409,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
@@ -559,16 +574,18 @@ system_aliases:
 # file starts with the string "# Exim filter" or "# Sieve filter", uncomment
 # the "allow_filter" option.
 
-# If you want this router to treat local parts with suffixes introduced by "-"
-# or "+" characters as if the suffixes did not exist, uncomment the two local_
-# part_suffix options. Then, for example, xxxx-foo@your.domain will be treated
-# in the same way as xxxx@your.domain by this router. You probably want to make
-# the same change to the localuser router.
-
 # The no_verify setting means that this router is skipped when Exim is
 # verifying addresses. Similarly, no_expn means that this router is skipped if
 # Exim is processing an EXPN command.
 
+# If you want this router to treat local parts with suffixes introduced by "-"
+# or "+" characters as if the suffixes did not exist, uncomment the two local_
+# part_suffix options. Then, for example, xxxx-foo@your.domain will be treated
+# in the same way as xxxx@your.domain by this router. Because this router is
+# not used for verification, if you choose to uncomment those options, then you
+# will *need* to make the same change to the localuser router.  (There are
+# other approaches, if this is undesirable, but they add complexity).
+
 # The check_ancestor option means that if the forward file generates an
 # address that is an ancestor of the current one, the current one gets
 # passed on instead. This covers the case where A is aliased to B and B
@@ -690,6 +707,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
 # -----------------    -----       -------