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

refix socket wrappers with rk_

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-12-21 08:50:46 +01:00
parent 687db64c56
commit d1d0de730d
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/krb5/auth_context.c
View File

@@ -170,9 +170,9 @@ krb5_auth_con_genaddrs(krb5_context context,
if(flags & KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR) { if(flags & KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR) {
if (auth_context->local_address == NULL) { if (auth_context->local_address == NULL) {
len = sizeof(ss_local); len = sizeof(ss_local);
if(IS_SOCKET_ERROR(getsockname(fd, local, &len))) { if(rk_IS_SOCKET_ERROR(getsockname(fd, local, &len))) {
char buf[128]; char buf[128];
ret = errno; ret = rk_SOCK_ERRNO;
rk_strerror_r(ret, buf, sizeof(buf)); rk_strerror_r(ret, buf, sizeof(buf));
krb5_set_error_message(context, ret, "getsockname: %s", buf); krb5_set_error_message(context, ret, "getsockname: %s", buf);
goto out; goto out;
@@ -188,9 +188,9 @@ krb5_auth_con_genaddrs(krb5_context context,
} }
if(flags & KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR) { if(flags & KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR) {
len = sizeof(ss_remote); len = sizeof(ss_remote);
if(IS_SOCKET_ERROR(getpeername(fd, remote, &len))) { if(rk_IS_SOCKET_ERROR(getpeername(fd, remote, &len))) {
char buf[128]; char buf[128];
ret = errno; ret = rk_SOCK_ERRNO;
rk_strerror_r(ret, buf, sizeof(buf)); rk_strerror_r(ret, buf, sizeof(buf));
krb5_set_error_message(context, ret, "getpeername: %s", buf); krb5_set_error_message(context, ret, "getpeername: %s", buf);
goto out; goto out;

6
lib/krb5/net_write.c
View File

@@ -70,8 +70,8 @@ krb5_net_write_block(krb5_context context,
tvp = NULL; tvp = NULL;
ret = select(fd + 1, NULL, &wfds, NULL, tvp); ret = select(fd + 1, NULL, &wfds, NULL, tvp);
if (IS_SOCKET_ERROR(ret)) { if (rk_IS_SOCKET_ERROR(ret)) {
if (SOCK_ERRNO == EINTR) if (rk_SOCK_ERRNO == EINTR)
continue; continue;
return -1; return -1;
} }
@@ -84,7 +84,7 @@ krb5_net_write_block(krb5_context context,
count = send (fd, cbuf, rem, 0); count = send (fd, cbuf, rem, 0);
if (IS_SOCKET_ERROR(count)) { if (rk_IS_SOCKET_ERROR(count)) {
return -1; return -1;
} }

12
lib/krb5/send_to_kdc.c
View File

@@ -80,7 +80,7 @@ recv_loop (krb5_socket_t fd,
} else { } else {
void *tmp; void *tmp;
if (SOCK_IOCTL (fd, FIONREAD, &nbytes) < 0) { if (rk_SOCK_IOCTL (fd, FIONREAD, &nbytes) < 0) {
krb5_data_free (rep); krb5_data_free (rep);
return -1; return -1;
} }
@@ -142,9 +142,9 @@ send_and_recv_tcp(krb5_socket_t fd,
krb5_data len_data; krb5_data len_data;
_krb5_put_int(len, req->length, 4); _krb5_put_int(len, req->length, 4);
if(net_write_s(fd, len, sizeof(len)) < 0) if(net_write (fd, len, sizeof(len)) < 0)
return -1; return -1;
if(net_write_s(fd, req->data, req->length) < 0) if(net_write (fd, req->data, req->length) < 0)
return -1; return -1;
if (recv_loop (fd, tmout, 0, 4, &len_data) < 0) if (recv_loop (fd, tmout, 0, 4, &len_data) < 0)
return -1; return -1;
@@ -194,7 +194,7 @@ send_and_recv_http(krb5_socket_t fd,
free(str); free(str);
if (request == NULL) if (request == NULL)
return -1; return -1;
ret = net_write_s (fd, request, strlen(request)); ret = net_write (fd, request, strlen(request));
free (request); free (request);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -266,7 +266,7 @@ send_via_proxy (krb5_context context,
struct addrinfo hints; struct addrinfo hints;
struct addrinfo *ai, *a; struct addrinfo *ai, *a;
int ret; int ret;
krb5_socket_t s = INVALID_SOCKET; krb5_socket_t s = rk_INVALID_SOCKET;
char portstr[NI_MAXSERV]; char portstr[NI_MAXSERV];
if (proxy == NULL) if (proxy == NULL)
@@ -416,7 +416,7 @@ krb5_sendto (krb5_context context,
for (a = ai; a != NULL; a = a->ai_next) { for (a = ai; a != NULL; a = a->ai_next) {
fd = socket (a->ai_family, a->ai_socktype | SOCK_CLOEXEC, a->ai_protocol); fd = socket (a->ai_family, a->ai_socktype | SOCK_CLOEXEC, a->ai_protocol);
if (IS_BAD_SOCKET(fd)) if (rk_IS_BAD_SOCKET(fd))
continue; continue;
rk_cloexec(fd); rk_cloexec(fd);
if (connect (fd, a->ai_addr, a->ai_addrlen) < 0) { if (connect (fd, a->ai_addr, a->ai_addrlen) < 0) {