svn commit: samba r11727 - in branches/SAMBA_4_0/source/winbind: .

[vlendec at samba.org]

Author: vlendec
Date: 2005-11-14 20:13:00 +0000 (Mon, 14 Nov 2005)
New Revision: 11727

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11727

Log:
Minor cleanup
Modified:
   branches/SAMBA_4_0/source/winbind/wb_async_helpers.c


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/wb_async_helpers.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_async_helpers.c	2005-11-14 19:36:46 UTC (rev 11726)
+++ branches/SAMBA_4_0/source/winbind/wb_async_helpers.c	2005-11-14 20:13:00 UTC (rev 11727)
@@ -311,30 +311,21 @@
 				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,