Disabled SSLv[2-3] in default configuration.

[packages/exim.git] / exim4.conf

diff --git a/exim4.conf b/exim4.conf
index c53718652784ac674e80a84e6a16f44375fd7861..0b323e27567fea04deb9793dfe9709c2160b37fb 100644 (file)
--- a/exim4.conf
+++ b/exim4.conf
@@ -200,18 +200,21 @@ never_users = root
 
 host_lookup = *
 
+# Advertise DSN for these hosts
 
-# The settings below, which are actually the same as the defaults in the
-# code, cause Exim to make RFC 1413 (ident) callbacks for all incoming SMTP
-# calls. You can limit the hosts to which these calls are made, and/or change
-# the timeout that is used. If you set the timeout to zero, all RFC 1413 calls
+dsn_advertise_hosts = *
+
+# The settings below (default is 30s) cause Exim to make RFC 1413 (ident)
+# callbacks for all incoming SMTP calls. You can limit the hosts to which
+# these calls are made, and/or change # the timeout that is used.
+# If you set the timeout to zero, all RFC 1413 calls
 # are disabled. RFC 1413 calls are cheap and can provide useful information
 # for tracing problem messages, but some hosts and firewalls have problems
 # with them. This can result in a timeout instead of an immediate refused
 # connection, leading to delays on starting up an SMTP session.
 
 rfc1413_hosts = *
-rfc1413_query_timeout = 30s
+rfc1413_query_timeout = 3s
 
 
 # By default, Exim expects all envelope addresses to be fully qualified, that
@@ -301,7 +304,7 @@ acl_check_rcpt:
 
   deny    message       = Restricted characters in address
           domains       = +local_domains
-          local_parts   = ^[.] : ^.*[@%!/|]
+          local_parts   = ^[.] : ^.*[@%!|]
 
   # The second rule applies to all other domains, and is less strict. This
   # allows your own users to send outgoing messages to sites that use slashes
@@ -314,7 +317,7 @@ acl_check_rcpt:
 
   deny    message       = Restricted characters in address
           domains       = !+local_domains
-          local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
+          local_parts   = ^[.|] : ^.*[@%!] : ^.*/\\.\\./
   #############################################################################
 
   # Accept mail to postmaster in any local domain, regardless of the source,