X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f1e5fef536bdc2c5d84c4bc7852d6e948253ccaf..exim-4_83_RC1:/src/exim_monitor/em_globals.c?ds=sidebyside diff --git a/src/exim_monitor/em_globals.c b/src/exim_monitor/em_globals.c index a9e4980b1..d5205d08f 100644 --- a/src/exim_monitor/em_globals.c +++ b/src/exim_monitor/em_globals.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/exim_monitor/em_globals.c,v 1.17 2009/11/16 19:50:36 nm4 Exp $ */ - /************************************************* * Exim Monitor * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2012 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -147,6 +145,11 @@ BOOL dkim_disable_verify = FALSE; BOOL dont_deliver = FALSE; +#ifdef EXPERIMENTAL_DSN +int dsn_ret = 0; +uschar *dsn_envid = NULL; +#endif + #ifdef WITH_CONTENT_SCAN int fake_response = OK; #endif @@ -213,9 +216,16 @@ int string_datestamp_length= 0; int string_datestamp_type = -1; BOOL timestamps_utc = FALSE; -BOOL tls_certificate_verified = FALSE; -uschar *tls_cipher = NULL; -uschar *tls_peerdn = NULL; +tls_support tls_in = { + -1, /* tls_active */ + 0, /* bits */ + FALSE, /* tls_certificate_verified */ + NULL, /* tls_cipher */ + FALSE, /* tls_on_connect */ + NULL, /* tls_on_connect_ports */ + NULL, /* tls_peerdn */ + NULL /* tls_sni */ +}; tree_node *tree_duplicates = NULL; tree_node *tree_nonrecipients = NULL;