r11517: Cleanup time, this looks larger than it is. This mainly gets rid of

wb_domain_request, now that we have queued rpc requests.

Volker
(This used to be commit 848522d1b64c1c283ac1ea7ce7f1a7a1b014a2aa)

1 files changed, 68 insertions, 203 deletions

diff --git a/source4/winbind/wb_cmd_usersids.c b/source4/winbind/wb_cmd_usersids.c
index 47c69fffc8..8b38ba56f4 100644
--- a/source4/winbind/wb_cmd_usersids.c
+++ b/source4/winbind/wb_cmd_usersids.c
@@ -29,177 +29,9 @@
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 
-/* Calculate the token in two steps: Go the user's originating domain, asking
- * for the user's domain groups. Then with the resulting list of sids go to
- * our own domain, expanding the aliases aka domain local groups. Two helpers
- * are needed: composite_samr_GetAliasMembership and wb_sidaliases. The core
- * function this file supplies is wb_cmd_usersids somewhere down. */
-
-
-/* composite_context wrapper around dcerpc_samr_GetAliasMembership */
-
-static void composite_samr_GetAliasMembership_recv_rpc(struct rpc_request *req);
-
-static struct composite_context *composite_samr_GetAliasMembership_send(struct dcerpc_pipe *p,
-									TALLOC_CTX *mem_ctx,
-									struct samr_GetAliasMembership *r)
-{
-	struct composite_context *result;
-	struct rpc_request *req;
-
-	result = talloc(mem_ctx, struct composite_context);
-	if (result == NULL) goto failed;
-	result->state = COMPOSITE_STATE_IN_PROGRESS;
-	result->async.fn = NULL;
-	result->event_ctx = p->conn->event_ctx;
-
-	req = dcerpc_samr_GetAliasMembership_send(p, mem_ctx, r);
-	if (req == NULL) goto failed;
-	req->async.callback = composite_samr_GetAliasMembership_recv_rpc;
-	req->async.private = result;
-	return result;
-
- failed:
-	talloc_free(result);
-	return NULL;
-}
-
-static void composite_samr_GetAliasMembership_recv_rpc(struct rpc_request *req)
-{
-	struct composite_context *ctx =
-		talloc_get_type(req->async.private, struct composite_context);
-
-	ctx->status = dcerpc_ndr_request_recv(req);
-	if (!composite_is_ok(ctx)) return;
-	composite_done(ctx);
-}
-
-static NTSTATUS composite_samr_GetAliasMembership_recv(struct composite_context *ctx)
-{
-	NTSTATUS status = composite_wait(ctx);
-	talloc_free(ctx);
-	return status;
-}
-
-/* Composite wrapper including domain selection and domain queueing around
- * GetAliasMemberships */
-
-struct sidaliases_state {
-	struct composite_context *ctx;
-	int num_sids;
-	const struct dom_sid *domain_sid;
-	const struct dom_sid *sids;
-
-	struct lsa_SidArray lsa_sids;
-	struct samr_Ids rids;
-	struct samr_GetAliasMembership r;
-};
-
-static struct composite_context *sidaliases_send_req(struct wbsrv_domain *domain,
-						     void *p);
-static NTSTATUS sidaliases_recv_req(struct composite_context *ctx, void *p);
-
-static struct composite_context *wb_sidaliases_send(struct wbsrv_service *service,
-						    int num_sids,
-						    struct dom_sid **sids)
-{
-	struct sidaliases_state *state;
-	int i;
-
-	state = talloc(NULL, struct sidaliases_state);
-
-	state->domain_sid = talloc_reference(state, service->primary_sid);
-	if (state->domain_sid == NULL) goto failed;
-
-	state->lsa_sids.num_sids = num_sids;
-	state->lsa_sids.sids = talloc_array(state, struct lsa_SidPtr,
-					    num_sids);
-	if (state->lsa_sids.sids == NULL) goto failed;
-
-	for (i=0; i<state->lsa_sids.num_sids; i++) {
-		state->lsa_sids.sids[i].sid =
-			talloc_reference(state->lsa_sids.sids, sids[i]);
-		if (state->lsa_sids.sids[i].sid == NULL) goto failed;
-	}
-
-	state->rids.count = 0;
-	state->rids.ids = NULL;
-
-	state->ctx = wb_domain_request_send(state, service,
-					    service->primary_sid,
-					    sidaliases_send_req,
-					    sidaliases_recv_req,
-					    state);
-	if (state->ctx == NULL) goto failed;
-	state->ctx->private_data = state;
-	return state->ctx;
-
- failed:
-	talloc_free(state);
-	return NULL;
-}
-
-static struct composite_context *sidaliases_send_req(struct wbsrv_domain *domain,
-						     void *p)
-{
-	struct sidaliases_state *state =
-		talloc_get_type(p, struct sidaliases_state);
-
-	state->r.in.domain_handle = domain->domain_handle;
-	state->r.in.sids = &state->lsa_sids;
-	state->r.out.rids = &state->rids;
-
-	return composite_samr_GetAliasMembership_send(domain->samr_pipe,
-						      state, &state->r);
-}
-
-static NTSTATUS sidaliases_recv_req(struct composite_context *ctx, void *p)
-{
-	struct sidaliases_state *state =
-		talloc_get_type(p, struct sidaliases_state);
-	NTSTATUS status;
-
-	status = composite_samr_GetAliasMembership_recv(ctx);
-	NT_STATUS_NOT_OK_RETURN(status);
-	return state->r.out.result;
-}
-
-static NTSTATUS wb_sidaliases_recv(struct composite_context *ctx,
-				   TALLOC_CTX *mem_ctx,
-				   int *num_sids,
-				   struct dom_sid ***sids)
-{
-	struct sidaliases_state *state =
-		talloc_get_type(ctx->private_data,
-				struct sidaliases_state);
-	NTSTATUS status;
-	int i;
-
-	status = composite_wait(ctx);
-	if (!NT_STATUS_IS_OK(status)) goto done;
-
-	*num_sids = state->r.out.rids->count;
-	*sids = talloc_array(mem_ctx, struct dom_sid *, *num_sids);
-	if (*sids == NULL) {
-		status = NT_STATUS_NO_MEMORY;
-		goto done;
-	}
-	for (i=0; i<*num_sids; i++) {
-		(*sids)[i] = dom_sid_add_rid((*sids), state->domain_sid,
-					     state->r.out.rids->ids[i]);
-		if ((*sids)[i] == NULL) {
-			status = NT_STATUS_NO_MEMORY;
-			goto done;
-		}
-	}
-
- done:
-	talloc_free(state);
-	return status;
-}
-
-/* Supplied a SID, go to the user's DC, ask it for the user's domain
- * groups. Then go to our DC, ask it for the domain local groups. */
+/* Calculate the token in two steps: Go the user's originating domain, ask for
+ * the user's domain groups. Then with the resulting list of sids go to our
+ * own domain to expand the aliases aka domain local groups. */
 
 struct cmd_usersids_state {
 	struct composite_context *ctx;
@@ -207,20 +39,27 @@ struct cmd_usersids_state {
 	struct dom_sid *user_sid;
 	int num_domgroups;
 	struct dom_sid **domgroups;
+
+	struct lsa_SidArray lsa_sids;
+	struct samr_Ids rids;
+	struct samr_GetAliasMembership r;
+
 	int num_sids;
 	struct dom_sid **sids;
 };
 
-static void cmd_usersids_recv_domgroups(struct composite_context *ctx);
-static void cmd_usersids_recv_aliases(struct composite_context *ctx);
+static void usersids_recv_domgroups(struct composite_context *ctx);
+static void usersids_recv_domain(struct composite_context *ctx);
+static void usersids_recv_aliases(struct rpc_request *req);
 
-struct composite_context *wb_cmd_usersids_send(struct wbsrv_service *service,
+struct composite_context *wb_cmd_usersids_send(TALLOC_CTX *mem_ctx,
+					       struct wbsrv_service *service,
 					       const struct dom_sid *sid)
 {
 	struct composite_context *result, *ctx;
 	struct cmd_usersids_state *state;
 
-	result = talloc_zero(NULL, struct composite_context);
+	result = talloc(mem_ctx, struct composite_context);
 	if (result == NULL) goto failed;
 	result->state = COMPOSITE_STATE_IN_PROGRESS;
 	result->async.fn = NULL;
@@ -235,10 +74,10 @@ struct composite_context *wb_cmd_usersids_send(struct wbsrv_service *service,
 	state->user_sid = dom_sid_dup(state, sid);
 	if (state->user_sid == NULL) goto failed;
 
-	ctx = wb_cmd_userdomgroups_send(service, sid);
+	ctx = wb_cmd_userdomgroups_send(state, service, sid);
 	if (ctx == NULL) goto failed;
 
-	ctx->async.fn = cmd_usersids_recv_domgroups;
+	ctx->async.fn = usersids_recv_domgroups;
 	ctx->async.private_data = state;
 	return result;
 
@@ -247,46 +86,69 @@ struct composite_context *wb_cmd_usersids_send(struct wbsrv_service *service,
 	return NULL;
 }
 
-static void cmd_usersids_recv_domgroups(struct composite_context *ctx)
+static void usersids_recv_domgroups(struct composite_context *ctx)
 {
 	struct cmd_usersids_state *state =
 		talloc_get_type(ctx->async.private_data,
 				struct cmd_usersids_state);
 
-	int i;
-	struct dom_sid **sids;
-
 	state->ctx->status = wb_cmd_userdomgroups_recv(ctx, state,
 						       &state->num_domgroups,
 						       &state->domgroups);
 	if (!composite_is_ok(state->ctx)) return;
 
-	sids = talloc_array(state, struct dom_sid *, state->num_domgroups+1);
-	if (composite_nomem(sids, state->ctx)) return;
+	ctx = wb_sid2domain_send(state, state->service,
+				 state->service->primary_sid);
+	composite_continue(state->ctx, ctx, usersids_recv_domain, state);
+}
+
+static void usersids_recv_domain(struct composite_context *ctx)
+{
+        struct cmd_usersids_state *state =
+                talloc_get_type(ctx->async.private_data,
+                                struct cmd_usersids_state);
+	struct rpc_request *req;
+	struct wbsrv_domain *domain;
+	int i;
+
+	state->ctx->status = wb_sid2domain_recv(ctx, &domain);
+	if (!composite_is_ok(state->ctx)) return;
+
+	state->lsa_sids.num_sids = state->num_domgroups+1;
+	state->lsa_sids.sids = talloc_array(state, struct lsa_SidPtr,
+					    state->lsa_sids.num_sids);
+	if (composite_nomem(state->lsa_sids.sids, state->ctx)) return;
 
-	sids[0] = state->user_sid;
+	state->lsa_sids.sids[0].sid = state->user_sid;
 	for (i=0; i<state->num_domgroups; i++) {
-		sids[i+1] = state->domgroups[i];
+		state->lsa_sids.sids[i+1].sid = state->domgroups[i];
 	}
 
-	ctx = wb_sidaliases_send(state->service, state->num_domgroups+1,
-				 sids);
-	composite_continue(state->ctx, ctx, cmd_usersids_recv_aliases, state);
+	state->rids.count = 0;
+	state->rids.ids = NULL;
+
+	state->r.in.domain_handle = domain->domain_handle;
+	state->r.in.sids = &state->lsa_sids;
+	state->r.out.rids = &state->rids;
+
+	req = dcerpc_samr_GetAliasMembership_send(domain->samr_pipe, state,
+						  &state->r);
+	composite_continue_rpc(state->ctx, req, usersids_recv_aliases, state);
 }
 
-static void cmd_usersids_recv_aliases(struct composite_context *ctx)
+static void usersids_recv_aliases(struct rpc_request *req)
 {
 	struct cmd_usersids_state *state =
-		talloc_get_type(ctx->async.private_data,
+		talloc_get_type(req->async.private,
 				struct cmd_usersids_state);
-	int i, num_aliases;
-	struct dom_sid **aliases;
+	int i;
 
-	state->ctx->status = wb_sidaliases_recv(ctx, state, &num_aliases,
-						&aliases);
+	state->ctx->status = dcerpc_ndr_request_recv(req);
+	if (!composite_is_ok(state->ctx)) return;
+	state->ctx->status = state->r.out.result;
 	if (!composite_is_ok(state->ctx)) return;
 
-	state->num_sids = 1 + state->num_domgroups + num_aliases;
+	state->num_sids = 1 + state->num_domgroups + state->r.out.rids->count;
 	state->sids = talloc_array(state, struct dom_sid *, state->num_sids);
 	if (composite_nomem(state->sids, state->ctx)) return;
 
@@ -297,9 +159,13 @@ static void cmd_usersids_recv_aliases(struct composite_context *ctx)
 			talloc_steal(state->sids, state->domgroups[i]);
 	}
 
-	for (i=0; i<num_aliases; i++) {
-		state->sids[1+i+state->num_domgroups] =
-			talloc_steal(state->sids, aliases[i]);
+	for (i=0; i<state->r.out.rids->count; i++) {
+		state->sids[1+state->num_domgroups+i] =	dom_sid_add_rid(
+			state->sids, state->service->primary_sid,
+			state->r.out.rids->ids[i]);
+
+		if (composite_nomem(state->sids[1+state->num_domgroups+i],
+				    state->ctx)) return;
 	}
 
 	composite_done(state->ctx);
@@ -321,13 +187,12 @@ NTSTATUS wb_cmd_usersids_recv(struct composite_context *ctx,
 	return status;
 }
 
-NTSTATUS wb_cmd_usersids(struct wbsrv_service *service,
-			      const struct dom_sid *sid,
-			      TALLOC_CTX *mem_ctx, int *num_sids,
-			      struct dom_sid ***sids)
+NTSTATUS wb_cmd_usersids(TALLOC_CTX *mem_ctx, struct wbsrv_service *service,
+			 const struct dom_sid *sid,
+			 int *num_sids, struct dom_sid ***sids)
 {
 	struct composite_context *c =
-		wb_cmd_usersids_send(service, sid);
+		wb_cmd_usersids_send(mem_ctx, service, sid);
 	return wb_cmd_usersids_recv(c, mem_ctx, num_sids, sids);
 }