X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=src%2Fsrc%2Fglobals.h;h=a51e3bc50657475312548f3efbd7bf035541798a;hp=c403b8b16ededee3809b94c7266ed77141a35b63;hb=fb2bba55d3916ab1d515f1a060f19009daf447ed;hpb=921b12ca0c361b9c543368edf057712afa02ca14 diff --git a/src/src/globals.h b/src/src/globals.h index c403b8b16..a51e3bc50 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -1,5 +1,3 @@ -/* $Cambridge: exim/src/src/globals.h,v 1.69 2010/06/12 15:21:26 jetmore Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ @@ -77,6 +75,7 @@ cluttered in several places (e.g. during logging) if we can always refer to them. Also, the tls_ variables are now always visible. */ extern int tls_active; /* fd/socket when in a TLS session */ +extern int tls_bits; /* bits used in TLS session */ extern BOOL tls_certificate_verified; /* Client certificate verified */ extern uschar *tls_cipher; /* Cipher used */ extern BOOL tls_on_connect; /* For older MTAs that don't STARTTLS */ @@ -92,6 +91,7 @@ extern uschar *openssl_options; /* OpenSSL compatibility options */ extern const pcre *regex_STARTTLS; /* For recognizing STARTTLS settings */ extern uschar *tls_advertise_hosts; /* host for which TLS is advertised */ extern uschar *tls_certificate; /* Certificate file */ +extern uschar *tls_channelbinding_b64; /* string of base64 channel binding */ extern uschar *tls_crl; /* CRL File */ extern uschar *tls_dhparam; /* DH param file */ extern BOOL tls_offered; /* Server offered TLS */ @@ -186,6 +186,7 @@ extern uschar *auth_defer_user_msg; /* Error message for user */ extern uschar *auth_vars[]; /* $authn variables */ extern int auto_thaw; /* Auto-thaw interval */ #ifdef WITH_CONTENT_SCAN +extern BOOL av_failed; /* TRUE if the AV process failed */ extern uschar *av_scanner; /* AntiVirus scanner to use for the malware condition */ #endif