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

make async glue for non async case work

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-11-23 17:56:06 -08:00
parent 42ba3389db
commit 599fefcb8d
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ipc/client.c
View File

@@ -385,6 +385,9 @@ unix_socket_ipc(void *ctx,
uint32_t rv; uint32_t rv;
int retval; int retval;
if (cred)
*cred = NULL;
rep->data = NULL; rep->data = NULL;
rep->length = 0; rep->length = 0;
@@ -400,11 +403,14 @@ unix_socket_ipc(void *ctx,
retval = ntohl(rv); retval = ntohl(rv);
rep->length = ntohl(len); rep->length = ntohl(len);
rep->data = malloc(rep->length); if (rep->length > 0) {
if (rep->data == NULL) rep->data = malloc(rep->length);
return -1; if (rep->data == NULL)
if (net_read(s->fd, rep->data, rep->length) != rep->length) return -1;
return -1; if (net_read(s->fd, rep->data, rep->length) != rep->length)
return -1;
} else
rep->data = NULL;
return retval; return retval;
} }
@@ -554,13 +560,15 @@ heim_ipc_async(heim_ipc ctx, const heim_idata *send, void *userctx,
{ {
if (ctx->ops->async == NULL) { if (ctx->ops->async == NULL) {
heim_idata recv; heim_idata recv;
heim_icred cred; heim_icred cred = NULL;
int ret; int ret;
ret = (ctx->ops->ipc)(ctx->ctx, send, &recv, &cred); ret = (ctx->ops->ipc)(ctx->ctx, send, &recv, &cred);
(*func)(userctx, ret, &recv, cred); (*func)(userctx, ret, &recv, cred);
heim_ipc_free_cred(cred); heim_ipc_free_cred(cred);
free(recv.data); free(recv.data);
return ret;
} else {
return (ctx->ops->async)(ctx->ctx, send, userctx, func);
} }
return (ctx->ops->async)(ctx->ctx, send, userctx, func);
} }