SOCKS: downgrade from DISABLE_SOCKS to SUPPORT_SOCKS in Local/Makefile

[users/jgh/exim.git] / src / src / smtp_out.c

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 88dde8301fd694574388ec0ec14c36df827853fd..da4a46f512122d3754dab032841b7a83d5c81d75 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -26,7 +26,6 @@ Arguments:
                which case the function does nothing
   host_af    AF_INET or AF_INET6 for the outgoing IP address
   addr       the mail address being handled (for setting errors)
                which case the function does nothing
   host_af    AF_INET or AF_INET6 for the outgoing IP address
   addr       the mail address being handled (for setting errors)

-  changed    if not NULL, set TRUE if expansion actually changed istring

   interface  point this to the interface
   msg        to add to any error message
 
   interface  point this to the interface
   msg        to add to any error message
 


@@ -36,7 +35,7 @@ Returns:     TRUE on success, FALSE on failure, with error message
 
 BOOL
 smtp_get_interface(uschar *istring, int host_af, address_item *addr,
 
 BOOL
 smtp_get_interface(uschar *istring, int host_af, address_item *addr,

-  BOOL *changed, uschar **interface, uschar *msg)
+  uschar **interface, uschar *msg)

 {
 const uschar * expint;
 uschar *iface;
 {
 const uschar * expint;
 uschar *iface;


@@ -54,8 +53,6 @@ if (expint == NULL)
   return FALSE;
   }
 
   return FALSE;
   }
 

-if (changed != NULL) *changed = expint != istring;
-

 while (isspace(*expint)) expint++;
 if (*expint == 0) return TRUE;
 
 while (isspace(*expint)) expint++;
 if (*expint == 0) return TRUE;
 


@@ -270,7 +267,7 @@ int
 smtp_connect(host_item *host, int host_af, int port, uschar *interface,
   int timeout, transport_instance * tb)
 {
 smtp_connect(host_item *host, int host_af, int port, uschar *interface,
   int timeout, transport_instance * tb)
 {

-#ifdef EXPERIMENTAL_SOCKS
+#ifdef SUPPORT_SOCKS

 smtp_transport_options_block * ob =
   (smtp_transport_options_block *)tb->options_block;
 #endif
 smtp_transport_options_block * ob =
   (smtp_transport_options_block *)tb->options_block;
 #endif


@@ -290,7 +287,7 @@ HDEBUG(D_transport|D_acl|D_v)
   {
   uschar * s = US" ";
   if (interface) s = string_sprintf(" from %s ", interface);
   {
   uschar * s = US" ";
   if (interface) s = string_sprintf(" from %s ", interface);

-#ifdef EXPERIMENTAL_SOCKS
+#ifdef SUPPORT_SOCKS

   if (ob->socks_proxy) s = string_sprintf("%svia proxy ", s);
 #endif
   debug_printf("Connecting to %s %s%s... ", host->name, callout_address, s);
   if (ob->socks_proxy) s = string_sprintf("%svia proxy ", s);
 #endif
   debug_printf("Connecting to %s %s%s... ", host->name, callout_address, s);


@@ -298,7 +295,7 @@ HDEBUG(D_transport|D_acl|D_v)
 
 /* Create and connect the socket */
 
 
 /* Create and connect the socket */
 

-#ifdef EXPERIMENTAL_SOCKS
+#ifdef SUPPORT_SOCKS

 if (ob->socks_proxy)
   return socks_sock_connect(host, host_af, port, interface, tb, timeout);
 #endif
 if (ob->socks_proxy)
   return socks_sock_connect(host, host_af, port, interface, tb, timeout);
 #endif