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
Logging: Add DT= to defer & fail message lines. Bug 322
[exim.git]
/
src
/
src
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 57f87a296c7e5be663f6c89adf6cc30e537b0bae..0ddb6276025e74f4a8ac718deabc46bea9d463e1 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-46,11
+46,11
@@
typedef struct {
uschar *hosts_avoid_tls;
uschar *hosts_verify_avoid_tls;
uschar *hosts_avoid_pipelining;
uschar *hosts_avoid_tls;
uschar *hosts_verify_avoid_tls;
uschar *hosts_avoid_pipelining;
-#if
def EXPERIMENTAL
_PIPE_CONNECT
+#if
ndef DISABLE
_PIPE_CONNECT
uschar *hosts_pipe_connect;
#endif
uschar *hosts_avoid_esmtp;
uschar *hosts_pipe_connect;
#endif
uschar *hosts_avoid_esmtp;
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
uschar *hosts_nopass_tls;
uschar *hosts_noproxy_tls;
#endif
uschar *hosts_nopass_tls;
uschar *hosts_noproxy_tls;
#endif
@@
-78,11
+78,14
@@
typedef struct {
#ifdef SUPPORT_SOCKS
uschar *socks_proxy;
#endif
#ifdef SUPPORT_SOCKS
uschar *socks_proxy;
#endif
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
uschar *tls_certificate;
uschar *tls_crl;
uschar *tls_privatekey;
uschar *tls_require_ciphers;
uschar *tls_certificate;
uschar *tls_crl;
uschar *tls_privatekey;
uschar *tls_require_ciphers;
+# ifdef EXPERIMENTAL_TLS_RESUME
+ uschar *tls_resumption_hosts;
+# endif
uschar *tls_sni;
uschar *tls_verify_certificates;
int tls_dh_min_bits;
uschar *tls_sni;
uschar *tls_verify_certificates;
int tls_dh_min_bits;
@@
-118,7
+121,7
@@
typedef struct {
BOOL smtps:1;
BOOL ok:1;
BOOL setting_up:1;
BOOL smtps:1;
BOOL ok:1;
BOOL setting_up:1;
-#if
def EXPERIMENTAL
_PIPE_CONNECT
+#if
ndef DISABLE
_PIPE_CONNECT
BOOL early_pipe_ok:1;
BOOL early_pipe_active:1;
#endif
BOOL early_pipe_ok:1;
BOOL early_pipe_active:1;
#endif
@@
-132,16
+135,16
@@
typedef struct {
BOOL utf8_needed:1;
#endif
BOOL dsn_all_lasthop:1;
BOOL utf8_needed:1;
#endif
BOOL dsn_all_lasthop:1;
-#if defined(SUPPORT_TLS) && defined(SUPPORT_DANE)
- BOOL dane:1;
+#if !defined(DISABLE_TLS) && defined(SUPPORT_DANE)
BOOL dane_required:1;
#endif
BOOL dane_required:1;
#endif
-#if
def EXPERIMENTAL
_PIPE_CONNECT
+#if
ndef DISABLE
_PIPE_CONNECT
BOOL pending_BANNER:1;
BOOL pending_EHLO:1;
#endif
BOOL pending_MAIL:1;
BOOL pending_BDAT:1;
BOOL pending_BANNER:1;
BOOL pending_EHLO:1;
#endif
BOOL pending_MAIL:1;
BOOL pending_BDAT:1;
+ BOOL RCPT_452:1;
BOOL good_RCPT:1;
BOOL completed_addr:1;
BOOL send_rset:1;
BOOL good_RCPT:1;
BOOL completed_addr:1;
BOOL send_rset:1;
@@
-158,10
+161,11
@@
typedef struct {
uschar * smtp_greeting;
uschar * helo_response;
#endif
uschar * smtp_greeting;
uschar * helo_response;
#endif
-#if
def EXPERIMENTAL
_PIPE_CONNECT
+#if
ndef DISABLE
_PIPE_CONNECT
ehlo_resp_precis ehlo_resp;
#endif
ehlo_resp_precis ehlo_resp;
#endif
+ struct timeval delivery_start;
address_item * first_addr;
address_item * next_addr;
address_item * sync_addr;
address_item * first_addr;
address_item * next_addr;
address_item * sync_addr;
@@
-196,9
+200,6
@@
extern void smtp_transport_closedown(transport_instance *);
-extern BOOL smtp_mail_auth_str(uschar *, unsigned,
- address_item *, smtp_transport_options_block *);
-
#ifdef SUPPORT_SOCKS
extern int socks_sock_connect(host_item *, int, int, uschar *,
transport_instance *, int);
#ifdef SUPPORT_SOCKS
extern int socks_sock_connect(host_item *, int, int, uschar *,
transport_instance *, int);