From 5c1d8810911af7335bf299fbb871f7230ea7a717 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 30 Jul 2006 18:36:17 +0000 Subject: r17326: make better usage of the composite api metze (This used to be commit 097c9f09f3b9b45f7b0386dfb02173c1515ed45c) --- source4/librpc/rpc/dcerpc_schannel.c | 12 +++--------- source4/librpc/rpc/dcerpc_smb2.c | 19 +++++-------------- 2 files changed, 8 insertions(+), 23 deletions(-) (limited to 'source4/librpc/rpc') diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c index e9b62ddc3a..9286707618 100644 --- a/source4/librpc/rpc/dcerpc_schannel.c +++ b/source4/librpc/rpc/dcerpc_schannel.c @@ -232,15 +232,12 @@ struct composite_context *dcerpc_schannel_key_send(TALLOC_CTX *mem_ctx, struct composite_context *epm_map_req; /* composite context allocation and setup */ - c = talloc_zero(mem_ctx, struct composite_context); + c = composite_create(mem_ctx, p->conn->event_ctx); if (c == NULL) return NULL; s = talloc_zero(c, struct schannel_key_state); if (composite_nomem(s, c)) return c; - - c->state = COMPOSITE_STATE_IN_PROGRESS; c->private_data = s; - c->event_ctx = p->conn->event_ctx; /* store parameters in the state structure */ s->pipe = p; @@ -357,16 +354,13 @@ struct composite_context *dcerpc_bind_auth_schannel_send(TALLOC_CTX *tmp_ctx, struct composite_context *schan_key_req; /* composite context allocation and setup */ - c = talloc_zero(tmp_ctx, struct composite_context); + c = composite_create(tmp_ctx, p->conn->event_ctx); if (c == NULL) return NULL; s = talloc_zero(c, struct auth_schannel_state); if (composite_nomem(s, c)) return c; - - c->state = COMPOSITE_STATE_IN_PROGRESS; c->private_data = s; - c->event_ctx = p->conn->event_ctx; - + /* store parameters in the state structure */ s->pipe = p; s->credentials = credentials; diff --git a/source4/librpc/rpc/dcerpc_smb2.c b/source4/librpc/rpc/dcerpc_smb2.c index f3d6f9fe0e..845884115c 100644 --- a/source4/librpc/rpc/dcerpc_smb2.c +++ b/source4/librpc/rpc/dcerpc_smb2.c @@ -371,13 +371,12 @@ struct composite_context *dcerpc_pipe_open_smb2_send(struct dcerpc_connection *c struct smb2_create io; struct smb2_request *req; - ctx = talloc_zero(NULL, struct composite_context); - if (ctx == NULL) goto failed; - ctx->state = COMPOSITE_STATE_IN_PROGRESS; - ctx->event_ctx = talloc_reference(c, c->event_ctx); + ctx = composite_create(c, c->event_ctx); + if (ctx == NULL) return NULL; state = talloc(ctx, struct pipe_open_smb2_state); - if (state == NULL) goto failed; + if (composite_nomem(state, ctx)) return ctx; + ctx->private_data = state; state->c = c; state->ctx = ctx; @@ -409,16 +408,8 @@ struct composite_context *dcerpc_pipe_open_smb2_send(struct dcerpc_connection *c io.in.fname = pipe_name; req = smb2_create_send(tree, &io); - if (req == NULL) goto failed; - - req->async.fn = pipe_open_recv; - req->async.private = state; - + composite_continue_smb2(ctx, req, pipe_open_recv, state); return ctx; - - failed: - talloc_free(ctx); - return NULL; } static void pipe_open_recv(struct smb2_request *req) -- cgit