s4:winbind Implement logic for getgroups to work

This function is called by the system everytime we do a id user or when we do wbinfo -r

Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de>

1 files changed, 57 insertions, 17 deletions

diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 2c846c4f15..99980d27a7 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -1183,31 +1183,51 @@ static void getgrgid_recv(struct composite_context *ctx)
 	wbsrv_samba3_async_epilogue(status, s3call);
 }
 
+static void getgroups_recv(struct composite_context *ctx);
+
 NTSTATUS wbsrv_samba3_getgroups(struct wbsrv_samba3_call *s3call)
 {
+	struct composite_context *ctx;
+	struct wbsrv_service *service = s3call->wbconn->listen_socket->service;
+
 	DEBUG(5, ("wbsrv_samba3_getgroups called\n"));
-	s3call->response.result = WINBINDD_ERROR;
+	/* S3 code do the same so why not ... */
+	s3call->request.data.username[sizeof(s3call->request.data.username)-1]='\0';
+	ctx = wb_cmd_getgroups_send(s3call, service, s3call->request.data.username);
+	NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+	ctx->async.fn = getgroups_recv;
+	ctx->async.private_data = s3call;
+	s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
 	return NT_STATUS_OK;
 }
 
-static void setgrent_recv(struct composite_context *ctx)
+static void getgroups_recv(struct composite_context *ctx)
 {
 	struct wbsrv_samba3_call *s3call =
 		talloc_get_type(ctx->async.private_data,
 				struct wbsrv_samba3_call);
+	gid_t *gids;
+	uint32_t num_groups;
 	NTSTATUS status;
-	struct wbsrv_grent *grent;
+	DEBUG(5, ("getgroups_recv called\n"));
 
-	DEBUG(5, ("setpwent_recv called\n"));
-
-	status = wb_cmd_setgrent_recv(ctx, s3call->wbconn, &grent);
+	status = wb_cmd_getgroups_recv(ctx, s3call, &gids, &num_groups);
 	if (NT_STATUS_IS_OK(status)) {
-		s3call->wbconn->protocol_private_data = grent;
+		uint32_t extra_len = sizeof(gid_t) * num_groups;
+
+		s3call->response.data.num_entries = num_groups;
+		s3call->response.extra_data.data = gids;
+		s3call->response.length += extra_len;
+	} else {
+		s3call->response.result = WINBINDD_ERROR;
 	}
 
 	wbsrv_samba3_async_epilogue(status, s3call);
 }
 
+static void setgrent_recv(struct composite_context *ctx);
+
 NTSTATUS wbsrv_samba3_setgrent(struct wbsrv_samba3_call *s3call)
 {
 	struct composite_context *ctx;
@@ -1224,29 +1244,26 @@ NTSTATUS wbsrv_samba3_setgrent(struct wbsrv_samba3_call *s3call)
 	return NT_STATUS_OK;
 }
 
-static void getgrent_recv(struct composite_context *ctx)
+static void setgrent_recv(struct composite_context *ctx)
 {
 	struct wbsrv_samba3_call *s3call =
 		talloc_get_type(ctx->async.private_data,
 				struct wbsrv_samba3_call);
 	NTSTATUS status;
-	struct winbindd_gr *gr;
-	uint32_t num_groups;
+	struct wbsrv_grent *grent;
 
-	DEBUG(5, ("getgrent_recv called\n"));
+	DEBUG(5, ("setpwent_recv called\n"));
 
-	status = wb_cmd_getgrent_recv(ctx, s3call, &gr, &num_groups);
+	status = wb_cmd_setgrent_recv(ctx, s3call->wbconn, &grent);
 	if (NT_STATUS_IS_OK(status)) {
-		uint32_t extra_len = sizeof(struct winbindd_gr) * num_groups;
-
-		s3call->response.data.num_entries = num_groups;
-		s3call->response.extra_data.data = gr;
-		s3call->response.length += extra_len;
+		s3call->wbconn->protocol_private_data = grent;
 	}
 
 	wbsrv_samba3_async_epilogue(status, s3call);
 }
 
+static void getgrent_recv(struct composite_context *ctx);
+
 NTSTATUS wbsrv_samba3_getgrent(struct wbsrv_samba3_call *s3call)
 {
 	struct composite_context *ctx;
@@ -1271,6 +1288,29 @@ NTSTATUS wbsrv_samba3_getgrent(struct wbsrv_samba3_call *s3call)
 	return NT_STATUS_OK;
 }
 
+static void getgrent_recv(struct composite_context *ctx)
+{
+	struct wbsrv_samba3_call *s3call =
+		talloc_get_type(ctx->async.private_data,
+				struct wbsrv_samba3_call);
+	NTSTATUS status;
+	struct winbindd_gr *gr;
+	uint32_t num_groups;
+
+	DEBUG(5, ("getgrent_recv called\n"));
+
+	status = wb_cmd_getgrent_recv(ctx, s3call, &gr, &num_groups);
+	if (NT_STATUS_IS_OK(status)) {
+		uint32_t extra_len = sizeof(struct winbindd_gr) * num_groups;
+
+		s3call->response.data.num_entries = num_groups;
+		s3call->response.extra_data.data = gr;
+		s3call->response.length += extra_len;
+	}
+
+	wbsrv_samba3_async_epilogue(status, s3call);
+}
+
 NTSTATUS wbsrv_samba3_endgrent(struct wbsrv_samba3_call *s3call)
 {
 	DEBUG(5, ("wbsrv_samba3_endgrent called\n"));