4 files changed, 7 insertions, 4 deletions
diff --git a/source4/winbind/wb_irpc.c b/source4/winbind/wb_irpc.c
index 1eed89fd41..2f2b0780c7 100644
--- a/source4/winbind/wb_irpc.c
+++ b/source4/winbind/wb_irpc.c
@@ -172,7 +172,7 @@ static void wb_irpc_get_idmap_callback(struct composite_context *ctx)
 
 	switch(s->level) {
 		case WINBIND_IDMAP_LEVEL_SIDS_TO_XIDS:
-			status = wb_sids2xids_recv(ctx, &s->req->out.ids);
+			status = wb_sids2xids_recv(ctx, &s->req->out.ids, NULL);
 			break;
 		case WINBIND_IDMAP_LEVEL_XIDS_TO_SIDS:
 			status = wb_xids2sids_recv(ctx, &s->req->out.ids);
diff --git a/source4/winbind/wb_sid2gid.c b/source4/winbind/wb_sid2gid.c
index b4026cd635..0b3589561f 100644
--- a/source4/winbind/wb_sid2gid.c
+++ b/source4/winbind/wb_sid2gid.c
@@ -72,7 +72,7 @@ static void sid2gid_recv_gid(struct composite_context *ctx)
 
 	struct id_map *ids = NULL;
 
-	state->ctx->status = wb_sids2xids_recv(ctx, &ids);
+	state->ctx->status = wb_sids2xids_recv(ctx, &ids, NULL);
 	if (!composite_is_ok(state->ctx)) return;
 
 	if (ids->status != ID_MAPPED) {
diff --git a/source4/winbind/wb_sid2uid.c b/source4/winbind/wb_sid2uid.c
index 1fff66f655..f1d9bdd677 100644
--- a/source4/winbind/wb_sid2uid.c
+++ b/source4/winbind/wb_sid2uid.c
@@ -72,7 +72,7 @@ static void sid2uid_recv_uid(struct composite_context *ctx)
 
 	struct id_map *ids = NULL;
 
-	state->ctx->status = wb_sids2xids_recv(ctx, &ids);
+	state->ctx->status = wb_sids2xids_recv(ctx, &ids, NULL);
 	if (!composite_is_ok(state->ctx)) return;
 
 	if (ids->status != ID_MAPPED) {
diff --git a/source4/winbind/wb_sids2xids.c b/source4/winbind/wb_sids2xids.c
index c966c40dc0..01ad64580b 100644
--- a/source4/winbind/wb_sids2xids.c
+++ b/source4/winbind/wb_sids2xids.c
@@ -74,7 +74,7 @@ struct composite_context *wb_sids2xids_send(TALLOC_CTX *mem_ctx,
 }
 
 NTSTATUS wb_sids2xids_recv(struct composite_context *ctx,
-			   struct id_map **ids)
+			   struct id_map **ids, unsigned *count)
 {
 	NTSTATUS status = composite_wait(ctx);
 	struct sids2xids_state *state =	talloc_get_type(ctx->private_data,
@@ -86,6 +86,9 @@ NTSTATUS wb_sids2xids_recv(struct composite_context *ctx,
 	 * the results are filled into the pointers the caller
 	 * supplied */
 	*ids = state->ids;
+	if (count != NULL) {
+		*count = state->count;
+	}
 
 	talloc_free(ctx);
 	return status;