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
tidying
[exim.git]
/
src
/
src
/
transports
/
smtp.h
diff --git
a/src/src/transports/smtp.h
b/src/src/transports/smtp.h
index 87ee16069cd603b4eedc42fe11d28e8575bcb83e..804b9942fd30370c840950ccab7a29a90762039a 100644
(file)
--- a/
src/src/transports/smtp.h
+++ b/
src/src/transports/smtp.h
@@
-59,7
+59,7
@@
typedef struct {
BOOL lmtp_ignore_quota;
uschar *expand_retry_include_ip_address;
BOOL retry_include_ip_address;
BOOL lmtp_ignore_quota;
uschar *expand_retry_include_ip_address;
BOOL retry_include_ip_address;
-#ifdef
EXPERIMENTAL
_SOCKS
+#ifdef
SUPPORT
_SOCKS
uschar *socks_proxy;
#endif
#ifdef SUPPORT_TLS
uschar *socks_proxy;
#endif
#ifdef SUPPORT_TLS
@@
-67,9
+67,6
@@
typedef struct {
uschar *tls_crl;
uschar *tls_privatekey;
uschar *tls_require_ciphers;
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;
int tls_dh_min_bits;
uschar *tls_sni;
uschar *tls_verify_certificates;
int tls_dh_min_bits;
@@
-79,12
+76,7
@@
typedef struct {
uschar *tls_verify_cert_hostnames;
#endif
#ifndef DISABLE_DKIM
uschar *tls_verify_cert_hostnames;
#endif
#ifndef DISABLE_DKIM
- uschar *dkim_domain;
- uschar *dkim_private_key;
- uschar *dkim_selector;
- uschar *dkim_canon;
- uschar *dkim_sign_headers;
- uschar *dkim_strict;
+ struct ob_dkim dkim;
#endif
} smtp_transport_options_block;
#endif
} smtp_transport_options_block;
@@
-111,8
+103,8
@@
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 *,
+#ifdef
SUPPORT
_SOCKS
+extern int socks_sock_connect(host_item
*
, int, int, uschar *,
transport_instance *, int);
#endif
transport_instance *, int);
#endif