Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810

[users/jgh/exim.git] / src / src / transports / smtp.h

diff --git a/src/src/transports/smtp.h b/src/src/transports/smtp.h
index 2aeab9add4441cc9bf065f5edf3f2ab569ac7581..07b601a969f246e37a1a2f21e29fe46403763467 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


@@ -111,7 +111,7 @@ 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 EXPERIMENTAL_SOCKS
+#ifdef SUPPORT_SOCKS

 extern int     socks_sock_connect(host_item *, int, int, uschar *,
                 transport_instance *, int);
 #endif
 extern int     socks_sock_connect(host_item *, int, int, uschar *,
                 transport_instance *, int);
 #endif