mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 13:50:38 -04:00
b527a33e86
tcp.cpp:135:10: error: assigning to 'int' from incompatible type '__bind<int &, sockaddr *&, unsigned long>'
rc = bind(m_fd, source, sizeof(struct sockaddr_in));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
http://beefy12.nyi.freebsd.org/data/head-amd64-default/p500844_s347134/logs/errors/postal-0.73_3.log
32 lines
908 B
C++
32 lines
908 B
C++
--- tcp.cpp.orig 2012-01-01 11:24:45 UTC
|
|
+++ tcp.cpp
|
|
@@ -132,7 +132,7 @@ int tcp::Connect(short port)
|
|
{
|
|
sockaddr *source;
|
|
source = (sockaddr *)m_sourceAddr->get_rand_addr();
|
|
- rc = bind(m_fd, source, sizeof(struct sockaddr_in));
|
|
+ rc = ::bind(m_fd, source, sizeof(struct sockaddr_in));
|
|
if(rc)
|
|
{
|
|
fprintf(stderr, "Can't bind to port.\n");
|
|
@@ -178,10 +178,18 @@ int tcp::ConnectTLS()
|
|
#ifdef USE_OPENSSL
|
|
m_sslCtx = NULL;
|
|
m_ssl = NULL;
|
|
- m_sslMeth = SSLv2_client_method();
|
|
+#ifndef OPENSSL_NO_SSL3
|
|
+ m_sslMeth = SSLv3_client_method();
|
|
+#else
|
|
+ m_sslMeth = SSLv23_client_method();
|
|
+#endif
|
|
if(m_sslMeth == NULL)
|
|
{
|
|
- fprintf(stderr, "Can't get SSLv2_client_method.\n");
|
|
+#ifndef OPENSSL_NO_SSL3
|
|
+ fprintf(stderr, "Can't get SSLv3_client_method.\n");
|
|
+#else
|
|
+ fprintf(stderr, "Can't get SSLv23_client_method.\n");
|
|
+#endif
|
|
error();
|
|
return 2;
|
|
}
|