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 99af732284a1fdc850b4a935fbae43f6a366c610..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.3 2005/01/04 16:36:28 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
05
*/
+/* 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;
@@
-32,8
+39,10
@@
typedef struct {
int final_timeout;
int size_addition;
int hosts_max_try;
int final_timeout;
int size_addition;
int hosts_max_try;
- int hosts_max_try_hardlimit;
+ int hosts_max_try_hardlimit;
+ BOOL address_retry_include_sender;
BOOL allow_localhost;
BOOL allow_localhost;
+ BOOL authenticated_sender_force;
BOOL gethostbyname;
BOOL dns_qualify_single;
BOOL dns_search_parents;
BOOL gethostbyname;
BOOL dns_qualify_single;
BOOL dns_search_parents;
@@
-41,15
+50,29
@@
typedef struct {
BOOL hosts_override;
BOOL hosts_randomize;
BOOL keepalive;
BOOL hosts_override;
BOOL hosts_randomize;
BOOL keepalive;
+ BOOL lmtp_ignore_quota;
BOOL retry_include_ip_address;
#ifdef SUPPORT_TLS
uschar *tls_certificate;
uschar *tls_crl;
uschar *tls_privatekey;
uschar *tls_require_ciphers;
BOOL retry_include_ip_address;
#ifdef SUPPORT_TLS
uschar *tls_certificate;
uschar *tls_crl;
uschar *tls_privatekey;
uschar *tls_require_ciphers;
+ 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
+ #ifndef DISABLE_DKIM
+ uschar *dkim_domain;
+ uschar *dkim_private_key;
+ uschar *dkim_selector;
+ uschar *dkim_canon;
+ uschar *dkim_sign_headers;
+ uschar *dkim_strict;
+ #endif
} smtp_transport_options_block;
/* Data for reading the private options. */
} smtp_transport_options_block;
/* Data for reading the private options. */