Compiler quietening and testcase consistency

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

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index 1e75a1e217a39ca7a7797fc81443c415a1c8a199..6f7295ca10b911ba24b97c9b7efcac258e9ef5f5 100644 (file)
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2012 */
+/* Copyright (c) University of Cambridge 1995 - 2014 */

 /* 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


@@ -41,6 +41,7 @@ it's a default value. */
 #define DELIVER_IN_BUFFER_SIZE     8192
 #define DELIVER_OUT_BUFFER_SIZE    8192
 #define DISABLE_DKIM
 #define DELIVER_IN_BUFFER_SIZE     8192
 #define DELIVER_OUT_BUFFER_SIZE    8192
 #define DISABLE_DKIM

+#define DISABLE_DNSSEC

 #define DISABLE_D_OPTION
 
 #define ENABLE_DISABLE_FSYNC
 #define DISABLE_D_OPTION
 
 #define ENABLE_DISABLE_FSYNC


@@ -49,7 +50,8 @@ it's a default value. */
 #define EXIMDB_LOCK_TIMEOUT          60
 #define EXIMDB_LOCKFILE_MODE       0640
 #define EXIMDB_MODE                0640
 #define EXIMDB_LOCK_TIMEOUT          60
 #define EXIMDB_LOCKFILE_MODE       0640
 #define EXIMDB_MODE                0640

-#define EXIM_CLIENT_DH_MIN_BITS
+#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
 #define EXIM_GNUTLS_LIBRARY_LOG_LEVEL
 #define EXIM_SERVER_DH_BITS_PRE2_12
 #define EXIM_PERL


@@ -150,6 +152,7 @@ it's a default value. */
 #define USE_DB
 #define USE_GDBM
 #define USE_GNUTLS
 #define USE_DB
 #define USE_GDBM
 #define USE_GNUTLS

+#define AVOID_GNUTLS_PKCS11

 #define USE_READLINE
 #define USE_TCP_WRAPPERS
 #define USE_TDB
 #define USE_READLINE
 #define USE_TCP_WRAPPERS
 #define USE_TDB


@@ -163,9 +166,17 @@ it's a default value. */
 /* EXPERIMENTAL features */
 #define EXPERIMENTAL_BRIGHTMAIL
 #define EXPERIMENTAL_DCC
 /* EXPERIMENTAL features */
 #define EXPERIMENTAL_BRIGHTMAIL
 #define EXPERIMENTAL_DCC

+#define EXPERIMENTAL_DMARC

 #define EXPERIMENTAL_OCSP
 #define EXPERIMENTAL_OCSP

+#define EXPERIMENTAL_PRDR
+#define EXPERIMENTAL_PROXY
+#define EXPERIMENTAL_REDIS

 #define EXPERIMENTAL_SPF
 #define EXPERIMENTAL_SRS
 #define EXPERIMENTAL_SPF
 #define EXPERIMENTAL_SRS

+#define EXPERIMENTAL_TPDA
+
+/* For developers */
+#define WANT_DEEPER_PRINTF_CHECKS

 
 /* Things that are not routinely changed but are nevertheless configurable
 just in case. */
 
 /* Things that are not routinely changed but are nevertheless configurable
 just in case. */


@@ -175,18 +186,13 @@ just in case. */
 #define ROOT_UID                      0
 #define ROOT_GID                      0
 
 #define ROOT_UID                      0
 #define ROOT_GID                      0
 

-/* Sizes for integer arithmetic.  Go for 64bit; can be overridden in OS/os.h-FOO */
-#ifndef int_eximarith_t
- #define int_eximarith_t int64_t
-#endif
-#ifndef PR_EXIM_ARITH
- #define PR_EXIM_ARITH "%" PRId64              /* C99 standard, printf %lld */
-#endif
-#ifndef SC_EXIM_ARITH
- #define SC_EXIM_ARITH "%" SCNi64              /* scanf incl. 0x prefix */
-#endif
-#ifndef SC_EXIM_DEC
- #define SC_EXIM_DEC   "%" SCNd64              /* scanf decimal */
-#endif
+/* 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 */
 
 /* End of config.h.defaults */