Merge branch 'upstream' into rebase_489

[hcoop/config/exim.git] / conf.d / main / 02_exim4-config_options

diff --git a/conf.d/main/02_exim4-config_options b/conf.d/main/02_exim4-config_options
index 80e90e1..81756e8 100644 (file)
--- a/conf.d/main/02_exim4-config_options
+++ b/conf.d/main/02_exim4-config_options
@@ -64,7 +64,7 @@ message_size_limit = MESSAGE_SIZE_LIMIT
 # Allow Exim to recognize addresses of the form "user@[10.11.12.13]",
 # where the domain part is a "domain literal" (an IP address) instead
 # of a named domain. The RFCs require this facility, but it is disabled
-# in the default config since it is seldomly used and frequently abused.
+# in the default config since it is rarely used and frequently abused.
 # Domain literal support also needs a special router, which is automatically
 # enabled if you use the enable macro MAIN_ALLOW_DOMAIN_LITERALS.
 # Additionally, you might want to make your local IP addresses (or @[])
@@ -91,18 +91,26 @@ host_lookup = MAIN_HOST_LOOKUP
 primary_hostname = MAIN_HARDCODE_PRIMARY_HOSTNAME
 .endif
 
-# 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
-# are disabled. RFC 1413 calls are cheap and can provide useful information
-# for tracing problem messages, but some hosts and firewalls are
-# misconfigured to drop the requests instead of either answering or
-# rejecting them. This can result in a timeout instead of an immediate refused
-# connection, leading to delays on starting up SMTP sessions. (The default was
-# reduced from 30s to 5s for release 4.61.)
-# rfc1413_hosts =
-# rfc1413_query_timeout = 0s
+# The settings below 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 SMTP sessions.
+# (The default was reduced from 30s to 5s for release 4.61. and to
+# disabled for release 4.86)
+#
+#rfc1413_hosts = 
+#rfc1413_query_timeout = 0s
+
+
+# Enable an efficiency feature.  We advertise the feature; clients
+# may request to use it.  For multi-recipient mails we then can
+# reject or accept per-user after the message is received.
+#
+prdr_enable = true
 
 # When using an external relay tester (such as rt.njabl.org and/or the
 # currently defunct relay-test.mail-abuse.org, the test may be aborted
@@ -198,6 +206,7 @@ trusted_groups = MAIN_TRUSTED_GROUPS
 # SMTP Banner. The example includes the Debian version in the SMTP dialog
 # MAIN_SMTP_BANNER = "${primary_hostname} ESMTP Exim ${version_number} (Debian package MAIN_PACKAGE_VERSION) ${tod_full}"
 # smtp_banner = $smtp_active_hostname ESMTP Exim $version_number $tod_full
+
 # hcoop-change: better load limiting
 # these values should be checked, documented, and committed to git (clinton)
 smtp_accept_max = 50
@@ -229,4 +238,14 @@ rfc1413_query_timeout = 0s
 
 # hcoop-change: submission + legacy smtp (many members use smtps)
 daemon_smtp_ports = smtp :  smtps : submission
-tls_on_connect_ports = smtps
\ No newline at end of file
+tls_on_connect_ports = smtps
+
+.ifdef MAIN_KEEP_ENVIRONMENT
+keep_environment = MAIN_KEEP_ENVIRONMENT
+.else
+# set option to empty value to avoid warning.
+keep_environment =
+.endif
+.ifdef MAIN_ADD_ENVIRONMENT
+add_environment = MAIN_ADD_ENVIRONMENT
+.endif