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

[kai at samba.org]

Author: kai
Date: 2007-08-13 16:20:26 +0000 (Mon, 13 Aug 2007)
New Revision: 24373

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

Log:
Implement backend for wbinfo -G (gid2sid)

Modified:
   branches/SAMBA_4_0/source/winbind/config.mk
   branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
   branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/config.mk
===================================================================
--- branches/SAMBA_4_0/source/winbind/config.mk	2007-08-13 16:07:47 UTC (rev 24372)
+++ branches/SAMBA_4_0/source/winbind/config.mk	2007-08-13 16:20:26 UTC (rev 24373)
@@ -16,6 +16,7 @@
 		wb_dom_info_trusted.o \
 		wb_sid2domain.o \
 		wb_name2domain.o \
+		wb_gid2sid.o \
 		wb_sid2uid.o \
 		wb_sid2gid.o \
 		wb_uid2sid.o \

Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2007-08-13 16:07:47 UTC (rev 24372)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2007-08-13 16:20:26 UTC (rev 24373)
@@ -875,3 +875,48 @@
 	wbsrv_samba3_async_epilogue(status, s3call);
 }
 
+static void gid2sid_recv(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_gid2sid(struct wbsrv_samba3_call *s3call)
+{
+	struct composite_context *ctx;
+	struct wbsrv_service *service =
+		s3call->wbconn->listen_socket->service;
+
+	DEBUG(5, ("wbsrv_samba3_gid2sid called\n"));
+
+	ctx = wb_gid2sid_send(s3call, service, s3call->request.data.gid);
+	NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+	ctx->async.fn = gid2sid_recv;
+	ctx->async.private_data = s3call;
+	s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+	return NT_STATUS_OK;
+
+}
+
+static void gid2sid_recv(struct composite_context *ctx)
+{
+	struct wbsrv_samba3_call *s3call =
+		talloc_get_type(ctx->async.private_data,
+				struct wbsrv_samba3_call);
+	NTSTATUS status;
+	struct dom_sid *sid;
+	char *sid_str;
+
+	DEBUG(5, ("gid2sid_recv called\n"));
+
+	status = wb_gid2sid_recv(ctx, s3call, &sid);
+	if(NT_STATUS_IS_OK(status)) {
+		sid_str = dom_sid_string(s3call, sid);
+
+		if (sid_str == NULL)
+			wbsrv_samba3_async_epilogue(NT_STATUS_NO_MEMORY,s3call);
+
+		WBSRV_SAMBA3_SET_STRING(s3call->response.data.sid.sid, sid_str);
+		s3call->response.data.sid.type = SID_NAME_DOMAIN;
+	}
+
+	wbsrv_samba3_async_epilogue(status, s3call);
+}
+

Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c	2007-08-13 16:07:47 UTC (rev 24372)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c	2007-08-13 16:20:26 UTC (rev 24373)
@@ -169,6 +169,10 @@
 	case WINBINDD_DUAL_UID2SID:
 		return wbsrv_samba3_uid2sid(s3call);
 
+	case WINBINDD_GID_TO_SID:
+	case WINBINDD_DUAL_GID2SID:
+		return wbsrv_samba3_gid2sid(s3call);
+
 		/* Unimplemented commands */
 
 	case WINBINDD_PAM_CHAUTHTOK:
@@ -178,7 +182,6 @@
 	case WINBINDD_LIST_GROUPS:
 	case WINBINDD_LOOKUPRIDS:
 	case WINBINDD_SIDS_TO_XIDS:
-	case WINBINDD_GID_TO_SID:
 	case WINBINDD_ALLOCATE_UID:
 	case WINBINDD_ALLOCATE_GID:
 	case WINBINDD_SET_MAPPING:
@@ -192,7 +195,6 @@
 	case WINBINDD_GETGRLST:
 	case WINBINDD_INIT_CONNECTION:
 	case WINBINDD_DUAL_SIDS2XIDS:
-	case WINBINDD_DUAL_GID2SID:
 	case WINBINDD_DUAL_SET_MAPPING:
 	case WINBINDD_DUAL_SET_HWM:
 	case WINBINDD_DUAL_DUMP_MAPS: