From f7732560eea1c5d1de316fb2d64b78ad7507549b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 14 Nov 2005 20:13:00 +0000 Subject: r11727: Minor cleanup (This used to be commit 681451af727d12294ecee1b8fddc595b0148003f) --- source4/winbind/wb_async_helpers.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c index 915638abb7..51907c1350 100644 --- a/source4/winbind/wb_async_helpers.c +++ b/source4/winbind/wb_async_helpers.c @@ -311,30 +311,21 @@ static void get_schannel_creds_recv_auth(struct rpc_request *req) struct get_schannel_creds_state); state->ctx->status = dcerpc_ndr_request_recv(req); - if (!NT_STATUS_IS_OK(state->ctx->status)) goto done; + if (!composite_is_ok(state->ctx)) return; state->ctx->status = state->a.out.result; - if (!NT_STATUS_IS_OK(state->ctx->status)) goto done; + if (!composite_is_ok(state->ctx)) return; if (!creds_client_check(state->creds_state, state->a.out.credentials)) { DEBUG(5, ("Server got us invalid creds\n")); - state->ctx->status = NT_STATUS_UNSUCCESSFUL; - goto done; + composite_error(state->ctx, NT_STATUS_UNSUCCESSFUL); + return; } cli_credentials_set_netlogon_creds(state->wks_creds, state->creds_state); - state->ctx->state = COMPOSITE_STATE_DONE; - - done: - if (!NT_STATUS_IS_OK(state->ctx->status)) { - state->ctx->state = COMPOSITE_STATE_ERROR; - } - if ((state->ctx->state >= COMPOSITE_STATE_DONE) && - (state->ctx->async.fn != NULL)) { - state->ctx->async.fn(state->ctx); - } + composite_done(state->ctx); } NTSTATUS wb_get_schannel_creds_recv(struct composite_context *c, -- cgit