Logging: for callout errors likely to be config problems, include the transport in...

[exim.git] / src / src / config.h.defaults

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 223e2d6451ac0e825b53cd1ea948929f03f73aa0..fb5fe3603bcb268420c77252b763071953204e9c 100644 (file)
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -2,8 +2,8 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

+/* Copyright (c) The Exim Maintainers 2018 - 2022 */

 /* Copyright (c) University of Cambridge 1995 - 2018 */
 /* Copyright (c) University of Cambridge 1995 - 2018 */

-/* Copyright (c) The Exim Maintainers 2018 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The default settings for Exim configuration variables. A #define without
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The default settings for Exim configuration variables. A #define without


@@ -31,7 +31,7 @@ Do not put spaces between # and the 'define'.
 #define AUTH_SPA
 #define AUTH_TLS
 
 #define AUTH_SPA
 #define AUTH_TLS
 

-#define AUTH_VARS                     3
+#define AUTH_VARS                     4

 
 #define BIN_DIRECTORY
 
 
 #define BIN_DIRECTORY
 


@@ -46,14 +46,18 @@ Do not put spaces between # and the 'define'.
 #define DEFAULT_CRYPT              crypt
 #define DELIVER_IN_BUFFER_SIZE     8192
 #define DELIVER_OUT_BUFFER_SIZE    8192
 #define DEFAULT_CRYPT              crypt
 #define DELIVER_IN_BUFFER_SIZE     8192
 #define DELIVER_OUT_BUFFER_SIZE    8192

+
+#define DISABLE_CLIENT_CMD_LOG
+#define DISABLE_D_OPTION

 #define DISABLE_DNSSEC
 #define DISABLE_DKIM
 #define DISABLE_EVENT
 #define DISABLE_OCSP
 #define DISABLE_PIPE_CONNECT
 #define DISABLE_PRDR
 #define DISABLE_DNSSEC
 #define DISABLE_DKIM
 #define DISABLE_EVENT
 #define DISABLE_OCSP
 #define DISABLE_PIPE_CONNECT
 #define DISABLE_PRDR

+#define DISABLE_QUEUE_RAMP

 #define DISABLE_TLS
 #define DISABLE_TLS

-#define DISABLE_D_OPTION
+#define DISABLE_TLS_RESUME

 
 #define ENABLE_DISABLE_FSYNC
 
 
 #define ENABLE_DISABLE_FSYNC
 


@@ -97,6 +101,7 @@ Do not put spaces between # and the 'define'.
 #define LOOKUP_IBASE
 #define LOOKUP_JSON
 #define LOOKUP_LDAP
 #define LOOKUP_IBASE
 #define LOOKUP_JSON
 #define LOOKUP_LDAP

+#define LOOKUP_LMDB

 #define LOOKUP_LSEARCH
 #define LOOKUP_MYSQL
 #define LOOKUP_NIS
 #define LOOKUP_LSEARCH
 #define LOOKUP_MYSQL
 #define LOOKUP_NIS


@@ -145,6 +150,7 @@ Do not put spaces between # and the 'define'.
 #define SUPPORT_CRYPTEQ
 #define SUPPORT_DANE
 #define SUPPORT_DMARC
 #define SUPPORT_CRYPTEQ
 #define SUPPORT_DANE
 #define SUPPORT_DMARC

+#define DMARC_API 100400

 #define DMARC_TLD_FILE "/etc/exim/opendmarc.tlds"
 #define SUPPORT_I18N
 #define SUPPORT_I18N_2008
 #define DMARC_TLD_FILE "/etc/exim/opendmarc.tlds"
 #define SUPPORT_I18N
 #define SUPPORT_I18N_2008


@@ -156,6 +162,7 @@ Do not put spaces between # and the 'define'.
 #define SUPPORT_PROXY
 #define SUPPORT_SOCKS
 #define SUPPORT_SPF
 #define SUPPORT_PROXY
 #define SUPPORT_SOCKS
 #define SUPPORT_SPF

+#define SUPPORT_SRS

 #define SUPPORT_TRANSLATE_IP_ADDRESS
 
 #define SYSLOG_LOG_PID
 #define SUPPORT_TRANSLATE_IP_ADDRESS
 
 #define SYSLOG_LOG_PID


@@ -175,6 +182,7 @@ Do not put spaces between # and the 'define'.
 #define USE_GDBM
 #define USE_GNUTLS
 #define AVOID_GNUTLS_PKCS11
 #define USE_GDBM
 #define USE_GNUTLS
 #define AVOID_GNUTLS_PKCS11

+#define USE_NDBM

 #define USE_OPENSSL
 #define USE_READLINE
 #define USE_TCP_WRAPPERS
 #define USE_OPENSSL
 #define USE_READLINE
 #define USE_TCP_WRAPPERS


@@ -201,11 +209,9 @@ Do not put spaces between # and the 'define'.
 #define EXPERIMENTAL_BRIGHTMAIL
 #define EXPERIMENTAL_DCC
 #define EXPERIMENTAL_DSN_INFO
 #define EXPERIMENTAL_BRIGHTMAIL
 #define EXPERIMENTAL_DCC
 #define EXPERIMENTAL_DSN_INFO

-#define EXPERIMENTAL_LMDB
+#define EXPERIMENTAL_ESMTP_LIMITS

 #define EXPERIMENTAL_QUEUEFILE
 #define EXPERIMENTAL_QUEUEFILE

-#define EXPERIMENTAL_SRS
-#define EXPERIMENTAL_SRS_NATIVE
-#define EXPERIMENTAL_TLS_RESUME
+#define EXPERIMENTAL_XCLIENT

 
 
 /* For developers */
 
 
 /* For developers */