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

Consistent use of SOCKET data type in lib/krb5

Browse Source
This commit is contained in:
Asanka Herath
2009-09-14 13:50:10 -04:00
committed by Love Hornquist Astrand
parent bd669f10eb
commit 4634af9078
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/krb5/auth_context.c
View File

@@ -157,7 +157,7 @@ krb5_auth_con_setaddrs(krb5_context context,
KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_auth_con_genaddrs(krb5_context context, krb5_auth_con_genaddrs(krb5_context context,
krb5_auth_context auth_context, krb5_auth_context auth_context,
int fd, int flags) SOCKET fd, int flags)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_address local_k_address, remote_k_address; krb5_address local_k_address, remote_k_address;
@@ -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(getsockname(fd, local, &len) < 0) { if(IS_SOCKET_ERROR(getsockname(fd, local, &len))) {
char buf[128]; char buf[128];
ret = errno; ret = SOCK_ERRNO;
strerror_r(ret, buf, sizeof(buf)); 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(getpeername(fd, remote, &len) < 0) { if(IS_SOCKET_ERROR(getpeername(fd, remote, &len))) {
char buf[128]; char buf[128];
ret = errno; ret = SOCK_ERRNO;
strerror_r(ret, buf, sizeof(buf)); 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;
@@ -221,7 +221,7 @@ krb5_auth_con_setaddrs_from_fd (krb5_context context,
krb5_auth_context auth_context, krb5_auth_context auth_context,
void *p_fd) void *p_fd)
{ {
int fd = *(int*)p_fd; SOCKET fd = *(SOCKET*)p_fd;
int flags = 0; int flags = 0;
if(auth_context->local_address == NULL) if(auth_context->local_address == NULL)
flags |= KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR; flags |= KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR;

2
lib/krb5/changepw.c
View File

@@ -603,6 +603,7 @@ change_password_loop (krb5_context context,
} }
} }
#ifndef NO_LIMIT_FD_SETSIZE
if (sock >= FD_SETSIZE) { if (sock >= FD_SETSIZE) {
ret = ERANGE; ret = ERANGE;
krb5_set_error_message(context, ret, krb5_set_error_message(context, ret,
@@ -610,6 +611,7 @@ change_password_loop (krb5_context context,
close (sock); close (sock);
goto out; goto out;
} }
#endif
FD_ZERO(&fdset); FD_ZERO(&fdset);
FD_SET(sock, &fdset); FD_SET(sock, &fdset);

2
lib/krb5/send_to_kdc.c
View File

@@ -58,9 +58,11 @@ recv_loop (SOCKET fd,
int ret; int ret;
int nbytes; int nbytes;
#ifndef NO_LIMIT_FD_SETSIZE
if (fd >= FD_SETSIZE) { if (fd >= FD_SETSIZE) {
return -1; return -1;
} }
#endif
krb5_data_zero(rep); krb5_data_zero(rep);
do { do {