X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fconfig.h.defaults;h=c33e09805ccba231e98739bdaa16659d18cf260f;hb=3386088d5af4d4c61faa12ae29560e2c5bd43304;hp=84dfe9ba1f6be9572f40f5ca3d9fd9e3f2ff7037;hpb=6bac1a9ad8ad304baae68ee3ab0de7d03d2fa239;p=exim.git

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 84dfe9ba1..c33e09805 100644
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/config.h.defaults,v 1.20 2010/06/12 15:21:26 jetmore Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The default settings for Exim configuration variables. A #define without
@@ -22,8 +20,11 @@ it's a default value. */
 #define AUTH_CRAM_MD5
 #define AUTH_CYRUS_SASL
 #define AUTH_DOVECOT
+#define AUTH_GSASL
+#define AUTH_HEIMDAL_GSSAPI
 #define AUTH_PLAINTEXT
 #define AUTH_SPA
+#define AUTH_TLS
 
 #define AUTH_VARS                     3
 
@@ -41,6 +42,9 @@ it's a default value. */
 #define DELIVER_IN_BUFFER_SIZE     8192
 #define DELIVER_OUT_BUFFER_SIZE    8192
 #define DISABLE_DKIM
+#define DISABLE_PRDR
+#define DISABLE_OCSP
+#define DISABLE_DNSSEC
 #define DISABLE_D_OPTION
 
 #define ENABLE_DISABLE_FSYNC
@@ -49,10 +53,15 @@ it's a default value. */
 #define EXIMDB_LOCK_TIMEOUT          60
 #define EXIMDB_LOCKFILE_MODE       0640
 #define EXIMDB_MODE                0640
+#define EXIM_CLIENT_DH_MIN_MIN_BITS         512
+#define EXIM_CLIENT_DH_DEFAULT_MIN_BITS    1024
+#define EXIM_GNUTLS_LIBRARY_LOG_LEVEL
+#define EXIM_SERVER_DH_BITS_PRE2_12
 #define EXIM_PERL
 /* Both uid and gid are triggered by this */
 #define EXIM_UID
 #define EXPAND_DLFUNC
+#define EXPAND_LISTMATCH_RHS
 
 #define FIXED_NEVER_USERS         "root"
 
@@ -100,6 +109,8 @@ it's a default value. */
 #define MAX_NAMED_LIST               16
 #define MSGLOG_DIRECTORY_MODE      0750
 
+#define NVALGRIND
+
 #define PID_FILE_PATH
 
 #define RADIUS_CONFIG_FILE
@@ -144,6 +155,7 @@ it's a default value. */
 #define USE_DB
 #define USE_GDBM
 #define USE_GNUTLS
+#define AVOID_GNUTLS_PKCS11
 #define USE_READLINE
 #define USE_TCP_WRAPPERS
 #define USE_TDB
@@ -155,10 +167,20 @@ it's a default value. */
 #define WITH_OLD_CLAMAV_STREAM
 
 /* EXPERIMENTAL features */
-#define EXPERIMENTAL_SPF
-#define EXPERIMENTAL_SRS
 #define EXPERIMENTAL_BRIGHTMAIL
+#define EXPERIMENTAL_DANE
 #define EXPERIMENTAL_DCC
+#define EXPERIMENTAL_DMARC
+#define EXPERIMENTAL_EVENT
+#define EXPERIMENTAL_INTERNATIONAL
+#define EXPERIMENTAL_PROXY
+#define EXPERIMENTAL_REDIS
+#define EXPERIMENTAL_SOCKS
+#define EXPERIMENTAL_SPF
+#define EXPERIMENTAL_SRS
+
+/* For developers */
+#define WANT_DEEPER_PRINTF_CHECKS
 
 /* Things that are not routinely changed but are nevertheless configurable
 just in case. */
@@ -168,4 +190,13 @@ just in case. */
 #define ROOT_UID                      0
 #define ROOT_GID                      0
 
+/* Sizes for integer arithmetic.
+Go for 64bit; can be overridden in OS/Makefile-FOO
+If you make it a different number of bits, provide a definition
+for EXIM_64B_MAX and _MIN in OS/oh.h-FOO */
+#define int_eximarith_t int64_t
+#define PR_EXIM_ARITH "%" PRId64		/* C99 standard, printf %lld */
+#define SC_EXIM_ARITH "%" SCNi64		/* scanf incl. 0x prefix */
+#define SC_EXIM_DEC   "%" SCNd64		/* scanf decimal */
+
 /* End of config.h.defaults */