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

kai at samba.org kai at samba.org
Mon Aug 20 11:38:01 GMT 2007


Author: kai
Date: 2007-08-20 11:38:00 +0000 (Mon, 20 Aug 2007)
New Revision: 24575

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

Log:
Implement setpwent

Added:
   branches/SAMBA_4_0/source/winbind/wb_cmd_setpwent.c
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_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/config.mk
===================================================================
--- branches/SAMBA_4_0/source/winbind/config.mk	2007-08-20 11:29:17 UTC (rev 24574)
+++ branches/SAMBA_4_0/source/winbind/config.mk	2007-08-20 11:38:00 UTC (rev 24575)
@@ -31,6 +31,7 @@
 		wb_cmd_usersids.o \
 		wb_cmd_list_trustdom.o \
 		wb_cmd_list_users.o \
+		wb_cmd_setpwent.o \
 		wb_pam_auth.o \
 		wb_sam_logon.o
 PRIVATE_DEPENDENCIES = \

Added: branches/SAMBA_4_0/source/winbind/wb_cmd_setpwent.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_cmd_setpwent.c	2007-08-20 11:29:17 UTC (rev 24574)
+++ branches/SAMBA_4_0/source/winbind/wb_cmd_setpwent.c	2007-08-20 11:38:00 UTC (rev 24575)
@@ -0,0 +1,143 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Command backend for setpwent
+
+   Copyright (C) Kai Blin 2007
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/composite/composite.h"
+#include "winbind/wb_server.h"
+#include "winbind/wb_async_helpers.h"
+#include "winbind/wb_helper.h"
+#include "smbd/service_task.h"
+#include "nsswitch/winbindd_nss.h"
+#include "libnet/libnet_proto.h"
+
+struct cmd_setpwent_state {
+	struct composite_context *ctx;
+	struct wbsrv_service *service;
+	struct libnet_context *libnet_ctx;
+
+	struct wbsrv_pwent *result;
+};
+
+static void cmd_setpwent_recv_domain(struct composite_context *ctx);
+static void cmd_setpwent_recv_user_list(struct composite_context *ctx);
+
+struct composite_context *wb_cmd_setpwent_send(TALLOC_CTX *mem_ctx,
+		struct wbsrv_service *service)
+{
+	struct composite_context *ctx, *result;
+	struct cmd_setpwent_state *state;
+
+	DEBUG(5, ("wb_cmd_setpwent_send called\n"));
+
+	result = composite_create(mem_ctx, service->task->event_ctx);
+	if (!result) return NULL;
+
+	state = talloc(mem_ctx, struct cmd_setpwent_state);
+	if (composite_nomem(state, result)) return result;
+
+	state->ctx = result;
+	result->private_data = state;
+	state->service = service;
+
+	state->result = talloc(state, struct wbsrv_pwent);
+	if (composite_nomem(state->result, state->ctx)) return result;
+
+	ctx = wb_sid2domain_send(state, service, service->primary_sid);
+	if (composite_nomem(ctx, state->ctx)) return result;
+
+	composite_continue(state->ctx, ctx, cmd_setpwent_recv_domain, state);
+	return result;
+}
+
+static void cmd_setpwent_recv_domain(struct composite_context *ctx)
+{
+	struct cmd_setpwent_state *state = talloc_get_type(
+			ctx->async.private_data, struct cmd_setpwent_state);
+	struct wbsrv_domain *domain;
+	struct libnet_UserList *user_list;
+
+	DEBUG(5, ("cmd_setpwent_recv_domain called\n"));
+
+	state->ctx->status = wb_sid2domain_recv(ctx, &domain);
+	if (!composite_is_ok(state->ctx)) return;
+
+	state->libnet_ctx = domain->libnet_ctx;
+
+	user_list = talloc(state->result, struct libnet_UserList);
+	if (composite_nomem(user_list, state->ctx)) return;
+
+	user_list->in.domain_name = talloc_strdup(state,
+			domain->libnet_ctx->samr.name);
+	if (composite_nomem(user_list->in.domain_name, state->ctx)) return;
+
+	/* Page size recommended by Rafal */
+	user_list->in.page_size = 128;
+
+	/* Always get the start of the list */
+	user_list->in.resume_index = 0;
+
+	ctx = libnet_UserList_send(domain->libnet_ctx, state->result, user_list,
+			NULL);
+
+	composite_continue(state->ctx, ctx, cmd_setpwent_recv_user_list, state);
+}
+
+static void cmd_setpwent_recv_user_list(struct composite_context *ctx)
+{
+	struct cmd_setpwent_state *state = talloc_get_type(
+			ctx->async.private_data, struct cmd_setpwent_state);
+	struct libnet_UserList *user_list;
+
+	DEBUG(5, ("cmd_setpwent_recv_user_list called\n"));
+
+	user_list = talloc(state->result, struct libnet_UserList);
+	if (composite_nomem(user_list, state->ctx)) return;
+
+	state->ctx->status = libnet_UserList_recv(ctx, state->result,
+			user_list);
+	if (!composite_is_ok(state->ctx)) return;
+
+	state->result->user_list = user_list;
+	state->result->page_index = 0;
+	state->result->libnet_ctx = state->libnet_ctx;
+
+	composite_done(state->ctx);
+}
+
+NTSTATUS wb_cmd_setpwent_recv(struct composite_context *ctx,
+		TALLOC_CTX *mem_ctx, struct wbsrv_pwent **pwent)
+{
+	NTSTATUS status = composite_wait(ctx);
+
+	DEBUG(5, ("wb_cmd_setpwent_recv called\n"));
+
+	if (NT_STATUS_IS_OK(status)) {
+		struct cmd_setpwent_state *state =
+			talloc_get_type(ctx->private_data,
+				struct cmd_setpwent_state);
+
+		*pwent = talloc_steal(mem_ctx, state->result);
+	}
+
+	talloc_free(ctx);
+	return status;
+}
+

Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2007-08-20 11:29:17 UTC (rev 24574)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2007-08-20 11:38:00 UTC (rev 24575)
@@ -762,13 +762,42 @@
 	wbsrv_samba3_async_epilogue(status, s3call);
 }
 
+static void setpwent_recv(struct composite_context *ctx);
+
 NTSTATUS wbsrv_samba3_setpwent(struct wbsrv_samba3_call *s3call)
 {
+	struct composite_context *ctx;
+	struct wbsrv_service *service = s3call->wbconn->listen_socket->service;
+
 	DEBUG(5, ("wbsrv_samba3_setpwent called\n"));
-	s3call->response.result = WINBINDD_OK;
+
+	ctx = wb_cmd_setpwent_send(s3call, service);
+	NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+	ctx->async.fn = setpwent_recv;
+	ctx->async.private_data = s3call;
+	s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
 	return NT_STATUS_OK;
 }
 
+static void setpwent_recv(struct composite_context *ctx)
+{
+	struct wbsrv_samba3_call *s3call =
+		talloc_get_type(ctx->async.private_data,
+				struct wbsrv_samba3_call);
+	NTSTATUS status;
+	struct wbsrv_pwent *pwent;
+
+	DEBUG(5, ("setpwent_recv called\n"));
+
+	status = wb_cmd_setpwent_recv(ctx, s3call->wbconn, &pwent);
+	if (NT_STATUS_IS_OK(status)) {
+		s3call->wbconn->protocol_private_data = pwent;
+	}
+
+	wbsrv_samba3_async_epilogue(status, s3call);
+}
+
 NTSTATUS wbsrv_samba3_getpwent(struct wbsrv_samba3_call *s3call)
 {
 	DEBUG(5, ("wbsrv_samba3_getpwent called\n"));

Modified: branches/SAMBA_4_0/source/winbind/wb_server.h
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_server.h	2007-08-20 11:29:17 UTC (rev 24574)
+++ branches/SAMBA_4_0/source/winbind/wb_server.h	2007-08-20 11:38:00 UTC (rev 24575)
@@ -23,7 +23,6 @@
 #include "nsswitch/winbindd_nss.h"
 #include "libnet/libnet.h"
 
-
 #define WINBINDD_SAMBA3_SOCKET "pipe"
 /* the privileged socket is in smbd_tmp_dir() */
 #define WINBINDD_SAMBA3_PRIVILEGED_SOCKET "winbind_pipe"
@@ -107,6 +106,20 @@
 } while(0)
 
 /*
+  state of a pwent query
+*/
+struct wbsrv_pwent {
+	/* Current UserList structure, contains 1+ user structs */
+	struct libnet_UserList *user_list;
+
+	/* Index of the next user struct in the current UserList struct */
+	uint32_t page_index;
+
+	/* The libnet_ctx to use for the libnet_UserList call */
+	struct libnet_context *libnet_ctx;
+};
+
+/*
   state of one request
 
   NOTE about async replies:



More information about the samba-cvs mailing list