git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
740f36d
)
Fix non-ipv6 socks compile
author
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 26 Mar 2015 13:59:12 +0000
(13:59 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Thu, 26 Mar 2015 13:59:12 +0000
(13:59 +0000)
src/src/transports/smtp_socks.c
patch
|
blob
|
history
diff --git
a/src/src/transports/smtp_socks.c
b/src/src/transports/smtp_socks.c
index cf9f73ba35d5fed3966ec0e8931f76f819f5b335..77f71ba361460c30b14d7c02482e795ca09eed92 100644
(file)
--- a/
src/src/transports/smtp_socks.c
+++ b/
src/src/transports/smtp_socks.c
@@
-229,6
+229,7
@@
while ((proxy_spec = string_nextinlist(&proxy_list, &sep, NULL, 0)))
/* send connect (ipver, ipaddr, port) */
buf[0] = 5; buf[1] = 1; buf[2] = 0; buf[3] = host_af == AF_INET6 ? 4 : 1;
+#if HAVE_IPV6
if (host_af == AF_INET6)
{
memcpy(buf+4, &sin.v6.sin6_addr, sizeof(sin.v6.sin6_addr));
@@
-237,6
+238,7
@@
while ((proxy_spec = string_nextinlist(&proxy_list, &sep, NULL, 0)))
size = 4+sizeof(sin.v6.sin6_addr)+sizeof(sin.v6.sin6_port);
}
else
+#endif
{
memcpy(buf+4, &sin.v4.sin_addr.s_addr, sizeof(sin.v4.sin_addr.s_addr));
memcpy(buf+4+sizeof(sin.v4.sin_addr.s_addr),