projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
When trying spooled messages, account for the local-interface in grouping for a conne...
[exim.git]
/
src
/
src
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 018f9cfef8befd932ea8000cee854f5cf454351d..84fb9f50c5082314a96246adee0e56af62282c3b 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-23,6
+23,7
@@
typedef struct {
uschar *hosts_require_auth;
#ifdef EXPERIMENTAL_DANE
uschar *hosts_try_dane;
uschar *hosts_require_auth;
#ifdef EXPERIMENTAL_DANE
uschar *hosts_try_dane;
+ uschar *hosts_require_dane;
#endif
#ifndef DISABLE_PRDR
uschar *hosts_try_prdr;
#endif
#ifndef DISABLE_PRDR
uschar *hosts_try_prdr;
@@
-57,7
+58,11
@@
typedef struct {
BOOL hosts_randomize;
BOOL keepalive;
BOOL lmtp_ignore_quota;
BOOL hosts_randomize;
BOOL keepalive;
BOOL lmtp_ignore_quota;
+ uschar *expand_retry_include_ip_address;
BOOL retry_include_ip_address;
BOOL retry_include_ip_address;
+#ifdef EXPERIMENTAL_SOCKS
+ uschar *socks_proxy;
+#endif
#ifdef SUPPORT_TLS
uschar *tls_certificate;
uschar *tls_crl;
#ifdef SUPPORT_TLS
uschar *tls_certificate;
uschar *tls_crl;
@@
-72,9
+77,7
@@
typedef struct {
BOOL tls_tempfail_tryclear;
uschar *tls_verify_hosts;
uschar *tls_try_verify_hosts;
BOOL tls_tempfail_tryclear;
uschar *tls_verify_hosts;
uschar *tls_try_verify_hosts;
-# ifdef EXPERIMENTAL_CERTNAMES
uschar *tls_verify_cert_hostnames;
uschar *tls_verify_cert_hostnames;
-# endif
#endif
#ifndef DISABLE_DKIM
uschar *dkim_domain;
#endif
#ifndef DISABLE_DKIM
uschar *dkim_domain;
@@
-84,9
+87,6
@@
typedef struct {
uschar *dkim_sign_headers;
uschar *dkim_strict;
#endif
uschar *dkim_sign_headers;
uschar *dkim_strict;
#endif
-#ifdef EXPERIMENTAL_TPDA
- uschar *tpda_host_defer_action;
-#endif
} smtp_transport_options_block;
/* Data for reading the private options. */
} smtp_transport_options_block;
/* Data for reading the private options. */
@@
-112,4
+112,9
@@
extern int smtp_auth(uschar *, unsigned, address_item *, host_item *,
extern BOOL smtp_mail_auth_str(uschar *, unsigned,
address_item *, smtp_transport_options_block *);
extern BOOL smtp_mail_auth_str(uschar *, unsigned,
address_item *, smtp_transport_options_block *);
+#ifdef EXPERMENTAL_SOCKS
+extern int socks_sock_connect(host_item, int, int, uschar *,
+ transport_instance *, int);
+#endif
+
/* End of transports/smtp.h */
/* End of transports/smtp.h */