git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 abc5b80feba6429a78a02eb6de5a05c2cd974924..da4a46f512122d3754dab032841b7a83d5c81d75 100644
(file)
--- a/
src/src/smtp_out.c
+++ b/
src/src/smtp_out.c
@@
-267,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)
{
-#if
ndef DISABLE
_SOCKS
+#if
def 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
@@
-287,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);
-#if
ndef DISABLE
_SOCKS
+#if
def 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);
@@
-295,7
+295,7
@@
HDEBUG(D_transport|D_acl|D_v)
/* Create and connect the socket */
/* Create and connect the socket */
-#if
ndef DISABLE
_SOCKS
+#if
def 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