git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DANE: smtp transport option dane_require_tls_ciphers
[users/heiko/exim.git]
/
src
/
exim_monitor
/
em_globals.c
diff --git
a/src/exim_monitor/em_globals.c
b/src/exim_monitor/em_globals.c
index 366af7e9744c93d774f4dd8d55ad337ff7e1d61c..50da58c82029d6b375939f214d2ee9f4f2d07299 100644
(file)
--- a/
src/exim_monitor/em_globals.c
+++ b/
src/exim_monitor/em_globals.c
@@
-2,7
+2,7
@@
* Exim Monitor *
*************************************************/
* Exim Monitor *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 201
2
*/
+/* Copyright (c) University of Cambridge 1995 - 201
8
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-130,7
+130,7
@@
int body_zerocount = 0;
BOOL deliver_firsttime = FALSE;
BOOL deliver_freeze = FALSE;
BOOL deliver_firsttime = FALSE;
BOOL deliver_freeze = FALSE;
-
int
deliver_frozen_at = 0;
+
time_t
deliver_frozen_at = 0;
BOOL deliver_manual_thaw = FALSE;
#ifndef DISABLE_DKIM
BOOL deliver_manual_thaw = FALSE;
#ifndef DISABLE_DKIM
@@
-145,6
+145,9
@@
BOOL dkim_disable_verify = FALSE;
BOOL dont_deliver = FALSE;
BOOL dont_deliver = FALSE;
+int dsn_ret = 0;
+uschar *dsn_envid = NULL;
+
#ifdef WITH_CONTENT_SCAN
int fake_response = OK;
#endif
#ifdef WITH_CONTENT_SCAN
int fake_response = OK;
#endif
@@
-184,13
+187,15
@@
uid_t originator_uid;
uschar *primary_hostname = NULL;
uschar *primary_hostname = NULL;
+uschar *queue_name = US"";
+
int received_count = 0;
uschar *received_protocol = NULL;
int received_count = 0;
uschar *received_protocol = NULL;
-
int received_time = 0
;
+
struct timeval received_time = { 0, 0 }
;
int recipients_count = 0;
recipient_item *recipients_list = NULL;
int recipients_list_max = 0;
int recipients_count = 0;
recipient_item *recipients_list = NULL;
int recipients_list_max = 0;
-
int
running_in_test_harness=FALSE;
+
BOOL
running_in_test_harness=FALSE;
uschar *sender_address = NULL;
uschar *sender_fullhost = NULL;
uschar *sender_address = NULL;
uschar *sender_fullhost = NULL;
@@
-213,7
+218,12
@@
int string_datestamp_type = -1;
BOOL timestamps_utc = FALSE;
tls_support tls_in = {
-1, /* tls_active */
BOOL timestamps_utc = FALSE;
tls_support tls_in = {
-1, /* tls_active */
+ 0, /* bits */
FALSE, /* tls_certificate_verified */
FALSE, /* tls_certificate_verified */
+#ifdef SUPPORT_DANE
+ FALSE, /* dane_verified */
+ 0, /* tlsa_usage */
+#endif
NULL, /* tls_cipher */
FALSE, /* tls_on_connect */
NULL, /* tls_on_connect_ports */
NULL, /* tls_cipher */
FALSE, /* tls_on_connect */
NULL, /* tls_on_connect_ports */