Pull Andreas Metzler's fix for gnutls_certificate_verify_peers (bug 1095)

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

diff --git a/src/src/config.h.defaults b/src/src/config.h.defaults
index b76c794253180261573eaf6dd2f5d2adf10aaa96..a36cfb0d240c97f0d7228065a291cb3d3fdd3b6d 100644 (file)
--- a/src/src/config.h.defaults
+++ b/src/src/config.h.defaults
@@ -1,21 +1,17 @@
-/* $Cambridge: exim/src/src/config.h.defaults,v 1.9 2006/02/07 11:19:00 ph10 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2006 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* The default settings for Exim configuration variables. A #define without
 any data just defines the existence of the variable; it won't get included
-in config.h unless some value is defined in Local/Makefile. */
-
-#define ACL_CVARS                    20
-#define ACL_MVARS                    20
+in config.h unless some value is defined in Local/Makefile. If there is data,
+it's a default value. */
 
 #define ALT_CONFIG_PREFIX
-#define ALT_CONFIG_ROOT_ONLY
+#define TRUSTED_CONFIG_LIST
 
 #define APPENDFILE_MODE            0600
 #define APPENDFILE_DIRECTORY_MODE  0700
@@ -23,9 +19,12 @@ in config.h unless some value is defined in Local/Makefile. */
 
 #define AUTH_CRAM_MD5
 #define AUTH_CYRUS_SASL
+#define AUTH_DOVECOT
 #define AUTH_PLAINTEXT
 #define AUTH_SPA
 
+#define AUTH_VARS                     3
+
 #define BIN_DIRECTORY
 
 #define CONFIGURE_FILE
@@ -39,8 +38,11 @@ in config.h unless some value is defined in Local/Makefile. */
 #define DEFAULT_CRYPT              crypt
 #define DELIVER_IN_BUFFER_SIZE     8192
 #define DELIVER_OUT_BUFFER_SIZE    8192
+#define DISABLE_DKIM
 #define DISABLE_D_OPTION
 
+#define ENABLE_DISABLE_FSYNC
+
 #define EXIMDB_DIRECTORY_MODE      0750
 #define EXIMDB_LOCK_TIMEOUT          60
 #define EXIMDB_LOCKFILE_MODE       0640
@@ -87,6 +89,8 @@ in config.h unless some value is defined in Local/Makefile. */
 #define LOOKUP_WILDLSEARCH
 #define LOOKUP_NWILDLSEARCH
 
+#define LOOKUP_MODULE_DIR
+
 #define MAX_FILTER_SIZE           (1024*1024)
 #define MAX_LOCALHOST_NUMBER        256
 #define MAX_INCLUDE_SIZE          (1024*1024)
@@ -125,6 +129,7 @@ in config.h unless some value is defined in Local/Makefile. */
 #define SYSLOG_LOG_PID
 #define SYSLOG_LONG_LINES
 
+#define TCP_WRAPPERS_DAEMON_NAME "exim"
 #define TIMEZONE_DEFAULT
 #define TMPDIR
 
@@ -141,20 +146,24 @@ in config.h unless some value is defined in Local/Makefile. */
 #define USE_TCP_WRAPPERS
 #define USE_TDB
 
+#define WHITELIST_D_MACROS
+
 #define WITH_CONTENT_SCAN
 #define WITH_OLD_DEMIME
+#define WITH_OLD_CLAMAV_STREAM
 
 /* EXPERIMENTAL features */
 #define EXPERIMENTAL_SPF
 #define EXPERIMENTAL_SRS
-#define EXPERIMENTAL_DOMAINKEYS
 #define EXPERIMENTAL_BRIGHTMAIL
+#define EXPERIMENTAL_DCC
 
 /* Things that are not routinely changed but are nevertheless configurable
 just in case. */
 
-#define DNS_MAXNAME                 256
+#define DNS_MAXNAME                1024
 #define EXPAND_MAXN                  20
 #define ROOT_UID                      0
+#define ROOT_GID                      0
 
 /* End of config.h.defaults */