git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: Add testcase for OCSP-nonaware client, to supporting server. Bug 1664
[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 671bd7f030167a81bd00b42255d5958b85b1a278..6415e4238675ed0042a167a2a29b9e9ecbc50d1d 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
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-145,10
+145,8
@@
BOOL dkim_disable_verify = FALSE;
BOOL dont_deliver = FALSE;
BOOL dont_deliver = FALSE;
-#ifdef EXPERIMENTAL_DSN
int dsn_ret = 0;
uschar *dsn_envid = NULL;
int dsn_ret = 0;
uschar *dsn_envid = NULL;
-#endif
#ifdef WITH_CONTENT_SCAN
int fake_response = OK;
#ifdef WITH_CONTENT_SCAN
int fake_response = OK;
@@
-220,6
+218,10
@@
tls_support tls_in = {
-1, /* tls_active */
0, /* bits */
FALSE, /* tls_certificate_verified */
-1, /* tls_active */
0, /* bits */
FALSE, /* tls_certificate_verified */
+#ifdef EXPERIMENTAL_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 */