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

SOCK_INIT/SOCK_EXIT -> rk_SOCK_INIT/rk_SOCK_EXIT and net_write_s() -> net_write()

Browse Source
This commit is contained in:
Asanka Herath
2009-11-26 01:42:57 -05:00
parent 67c3295fcb
commit 393a597858
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5/context.c
View File

@@ -363,7 +363,7 @@ krb5_init_context(krb5_context *context)
if (ret)
goto out;
#endif
if (SOCK_INIT())
if (rk_SOCK_INIT())
p->flags |= KRB5_CTX_F_SOCKETS_INITIALIZED;
out:
@@ -534,7 +534,7 @@ krb5_free_context(krb5_context context)
HEIMDAL_MUTEX_destroy(context->mutex);
free(context->mutex);
if (context->flags & KRB5_CTX_F_SOCKETS_INITIALIZED) {
SOCK_EXIT();
rk_SOCK_EXIT();
}
memset(context, 0, sizeof(*context));

8
lib/krb5/send_to_kdc.c
View File

@@ -80,7 +80,7 @@ recv_loop (krb5_socket_t fd,
} else {
void *tmp;
if (SOCK_IOCTL (fd, FIONREAD, &nbytes) < 0) {
if (rk_SOCK_IOCTL (fd, FIONREAD, &nbytes) < 0) {
krb5_data_free (rep);
return -1;
}
@@ -142,9 +142,9 @@ send_and_recv_tcp(krb5_socket_t fd,
krb5_data len_data;
_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;
if(net_write_s(fd, req->data, req->length) < 0)
if(net_write(fd, req->data, req->length) < 0)
return -1;
if (recv_loop (fd, tmout, 0, 4, &len_data) < 0)
return -1;
@@ -194,7 +194,7 @@ send_and_recv_http(krb5_socket_t fd,
free(str);
if (request == NULL)
return -1;
ret = net_write_s (fd, request, strlen(request));
ret = net_write (fd, request, strlen(request));
free (request);
if (ret < 0)
return ret;