Logging: fix syslog logging for syslog_timestamp=no and log_selector +millisec

[exim.git] / src / src / globals.c

diff --git a/src/src/globals.c b/src/src/globals.c
index 1db5ece3297aacfcf8508739d8c3061d8aa9f728..16a5ab42e9c292b23e3d719b6bd3550ca04f0b7c 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -427,6 +427,7 @@ struct arc_set *arc_received        = NULL;
 int     arc_received_instance  = 0;
 int     arc_oldest_pass                = 0;
 const uschar *arc_state                = NULL;
+const uschar *arc_state_reason = NULL;
 #endif
 
 uschar *authenticated_fail_id  = NULL;
@@ -671,6 +672,7 @@ BOOL    dkim_collect_input       = FALSE;
 uschar *dkim_cur_signer          = NULL;
 BOOL    dkim_disable_verify      = FALSE;
 int     dkim_key_length          = 0;
+void   *dkim_signatures                 = NULL;
 uschar *dkim_signers             = NULL;
 uschar *dkim_signing_domain      = NULL;
 uschar *dkim_signing_selector    = NULL;
@@ -769,6 +771,10 @@ uschar *gecos_name             = NULL;
 uschar *gecos_pattern          = NULL;
 rewrite_rule  *global_rewrite_rules = NULL;
 
+volatile sig_atomic_t had_command_timeout = 0;
+volatile sig_atomic_t had_command_sigterm = 0;
+volatile sig_atomic_t had_data_timeout    = 0;
+volatile sig_atomic_t had_data_sigint     = 0;
 uschar *headers_charset        = US HEADERS_CHARSET;
 int     header_insert_maxlen   = 64 * 1024;
 header_line  *header_last      = NULL;
@@ -852,8 +858,10 @@ uschar *local_interfaces       = US"<; ::0 ; 0.0.0.0";
 uschar *local_interfaces       = US"0.0.0.0";
 #endif
 
+#ifdef HAVE_LOCAL_SCAN
 uschar *local_scan_data        = NULL;
 int     local_scan_timeout     = 5*60;
+#endif
 BOOL    local_sender_retain    = FALSE;
 gid_t   local_user_gid         = (gid_t)(-1);
 uid_t   local_user_uid         = (uid_t)(-1);