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
OCSP-stapling enhancement and testing.
[exim.git]
/
src
/
src
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 4f5dec707e78fd37016daa3be7793512b9bb2e5f..4bea2030de6a132f4be20a90878ac1a7782d70e4 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/transports/smtp.h,v 1.11 2007/01/18 15:35:43 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
07
*/
+/* Copyright (c) University of Cambridge 1995 - 20
12
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Private structure for the private options and other private data. */
/* See the file NOTICE for conditions of use and distribution. */
/* Private structure for the private options and other private data. */
@@
-19,11
+17,20
@@
typedef struct {
uschar *interface;
uschar *port;
uschar *protocol;
uschar *interface;
uschar *port;
uschar *protocol;
+ uschar *dscp;
uschar *serialize_hosts;
uschar *hosts_try_auth;
uschar *hosts_require_auth;
uschar *serialize_hosts;
uschar *hosts_try_auth;
uschar *hosts_require_auth;
+#ifdef EXPERIMENTAL_PRDR
+ uschar *hosts_try_prdr;
+#endif
+#ifdef EXPERIMENTAL_OCSP
+ uschar *hosts_require_ocsp;
+#endif
uschar *hosts_require_tls;
uschar *hosts_avoid_tls;
uschar *hosts_require_tls;
uschar *hosts_avoid_tls;
+ uschar *hosts_verify_avoid_tls;
+ uschar *hosts_avoid_pipelining;
uschar *hosts_avoid_esmtp;
uschar *hosts_nopass_tls;
int command_timeout;
uschar *hosts_avoid_esmtp;
uschar *hosts_nopass_tls;
int command_timeout;
@@
-53,16
+60,18
@@
typedef struct {
uschar *gnutls_require_kx;
uschar *gnutls_require_mac;
uschar *gnutls_require_proto;
uschar *gnutls_require_kx;
uschar *gnutls_require_mac;
uschar *gnutls_require_proto;
+ uschar *tls_sni;
uschar *tls_verify_certificates;
uschar *tls_verify_certificates;
+ int tls_dh_min_bits;
BOOL tls_tempfail_tryclear;
#endif
BOOL tls_tempfail_tryclear;
#endif
- #if
def EXPERIMENTAL_DOMAINKEYS
- uschar *dk_domain;
- uschar *dk_private_key;
- uschar *dk_selector;
- uschar *dk_canon;
- uschar *dk_headers;
- uschar *dk_strict;
+ #if
ndef DISABLE_DKIM
+ uschar *dk
im
_domain;
+ uschar *dk
im
_private_key;
+ uschar *dk
im
_selector;
+ uschar *dk
im
_canon;
+ uschar *dk
im_sign
_headers;
+ uschar *dk
im
_strict;
#endif
} smtp_transport_options_block;
#endif
} smtp_transport_options_block;