oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Winsock connect returns WSAEWOULDBLOCK...

Browse Source 
...instead of EINPROGRESS.  And we get to call WSAGetLasteError() too boot :(
This commit is contained in:
Nicolas Williams
2013-03-18 23:15:29 -05:00
parent b1e4766753
commit f490acc526
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/send_to_kdc.c
View File

@@ -484,6 +484,10 @@ host_connect(krb5_context context, krb5_sendto_ctx ctx, struct host *host)
debug_host(context, 5, host, "connecting to host"); debug_host(context, 5, host, "connecting to host");
if (connect(host->fd, ai->ai_addr, ai->ai_addrlen) < 0) { if (connect(host->fd, ai->ai_addr, ai->ai_addrlen) < 0) {
#ifdef HAVE_WINSOCK
if (WSAGetLastError() == WSAEWOULDBLOCK)
errno = EINPROGRESS;
#endif /* HAVE_WINSOCK */
if (errno == EINPROGRESS && (hi->proto == KRB5_KRBHST_HTTP || hi->proto == KRB5_KRBHST_TCP)) { if (errno == EINPROGRESS && (hi->proto == KRB5_KRBHST_HTTP || hi->proto == KRB5_KRBHST_TCP)) {
debug_host(context, 5, host, "connecting to %d", host->fd); debug_host(context, 5, host, "connecting to %d", host->fd);
host->state = CONNECTING; host->state = CONNECTING;

3
lib/roken/roken.h.in
View File

@@ -1175,6 +1175,9 @@ int ROKEN_LIB_FUNCTION rk_socket(int, int, int);
#ifndef EAFNOSUPPORT #ifndef EAFNOSUPPORT
#define EAFNOSUPPORT 102 #define EAFNOSUPPORT 102
#endif #endif
#ifndef EINPROGRESS
#define EINPROGRESS 112
#endif
#ifndef ENOTSOCK #ifndef ENOTSOCK
#define ENOTSOCK 128 #define ENOTSOCK 128
#endif #endif