X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/2d14f39731e88a6d6bb9f1b5c56f497eb12198c4..8e6c4db10e5b9bc2fa89a7b5d38fcf12bb03fd2f:/src/src/globals.c

diff --git a/src/src/globals.c b/src/src/globals.c
index 9e6f9d347..28cb06028 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -35,7 +35,7 @@ optionlist optionlist_auths[] = {
                  (void *)(offsetof(auth_instance, set_id)) }
 };
 
-int     optionlist_auths_size = sizeof(optionlist_auths)/sizeof(optionlist);
+int     optionlist_auths_size = nelem(optionlist_auths);
 
 /* An empty host aliases list. */
 
@@ -488,11 +488,11 @@ int     callout_cache_positive_expire = 24*60*60;
 int     callout_cache_negative_expire = 2*60*60;
 uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing";
 uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W](?>[a-z0-9/_-]*[^\\W])?)+(\\.?)$";
-int     check_log_inodes       = 0;
-int     check_log_space        = 0;
+int     check_log_inodes       = 100;
+int     check_log_space        = 10*1024;	/* 10K Kbyte == 10MB */
 BOOL    check_rfc2047_length   = TRUE;
-int     check_spool_inodes     = 0;
-int     check_spool_space      = 0;
+int     check_spool_inodes     = 100;
+int     check_spool_space      = 10*1024;	/* 10K Kbyte == 10MB */
 
 uschar *chunking_advertise_hosts = US"*";
 unsigned chunking_datasize     = 0;
@@ -532,6 +532,7 @@ uschar *continue_transport     = NULL;
 uschar *csa_status             = NULL;
 cut_t   cutthrough = {
   FALSE,				/* delivery: when to attempt */
+  FALSE,				/* on defer: spool locally */
   -1,					/* fd: open connection */
   0,					/* nrcpt: number of addresses */
 };
@@ -924,6 +925,8 @@ int     lookup_open_max        = 25;
 uschar *lookup_value           = NULL;
 
 macro_item  *macros            = NULL;
+macro_item  *mlast             = NULL;
+BOOL    macros_builtin_created = FALSE;
 uschar *mailstore_basename     = NULL;
 #ifdef WITH_CONTENT_SCAN
 uschar *malware_name           = NULL;  /* Virus Name */