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

kai at samba.org kai at samba.org
Mon Aug 13 15:49:09 GMT 2007


Author: kai
Date: 2007-08-13 15:49:09 +0000 (Mon, 13 Aug 2007)
New Revision: 24370

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

Log:
Implement wbinfo -i backend (getpwnam)

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


Changeset:
Modified: branches/SAMBA_4_0/source/winbind/config.mk
===================================================================
--- branches/SAMBA_4_0/source/winbind/config.mk	2007-08-13 15:41:31 UTC (rev 24369)
+++ branches/SAMBA_4_0/source/winbind/config.mk	2007-08-13 15:49:09 UTC (rev 24370)
@@ -23,6 +23,7 @@
 		wb_cmd_lookupname.o \
 		wb_cmd_lookupsid.o \
 		wb_cmd_getdcname.o \
+		wb_cmd_getpwnam.o \
 		wb_cmd_userdomgroups.o \
 		wb_cmd_usersids.o \
 		wb_cmd_list_trustdom.o \

Added: branches/SAMBA_4_0/source/winbind/wb_cmd_getpwnam.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_cmd_getpwnam.c	2007-08-13 15:41:31 UTC (rev 24369)
+++ branches/SAMBA_4_0/source/winbind/wb_cmd_getpwnam.c	2007-08-13 15:49:09 UTC (rev 24370)
@@ -0,0 +1,194 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   Command backend for wbinfo -i
+
+   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"
+#include "param/proto.h"
+#include "libcli/security/proto.h"
+
+struct cmd_getpwnam_state {
+	struct composite_context *ctx;
+	struct wbsrv_service *service;
+	char *name;
+	char *workgroup_name;
+	struct dom_sid *group_sid;
+
+	struct winbindd_pw *result;
+};
+
+static void cmd_getpwnam_recv_domain(struct composite_context *ctx);
+static void cmd_getpwnam_recv_user_info(struct composite_context *ctx);
+static void cmd_getpwnam_recv_uid(struct composite_context *ctx);
+static void cmd_getpwnam_recv_gid(struct composite_context *ctx);
+
+struct composite_context *wb_cmd_getpwnam_send(TALLOC_CTX *mem_ctx,
+						 struct wbsrv_service *service,
+						 const char *name)
+{
+	struct composite_context *result, *ctx;
+	struct cmd_getpwnam_state *state;
+
+	DEBUG(5, ("wb_cmd_getpwnam_send called\n"));
+
+	result = composite_create(mem_ctx, service->task->event_ctx);
+	if (!result) return NULL;
+
+	state = talloc(result, struct cmd_getpwnam_state);
+	if (composite_nomem(state, result)) return result;
+	state->ctx = result;
+	result->private_data = state;
+	state->service = service;
+	state->name = talloc_strdup(state, name);
+	if(composite_nomem(state->name, result)) return result;
+
+	ctx = wb_name2domain_send(state, service, name);
+	if (composite_nomem(ctx, result)) return result;
+
+	composite_continue(result, ctx, cmd_getpwnam_recv_domain, state);
+	return result;
+}
+
+static void cmd_getpwnam_recv_domain(struct composite_context *ctx)
+{
+	struct cmd_getpwnam_state *state = talloc_get_type(
+			ctx->async.private_data, struct cmd_getpwnam_state);
+	struct wbsrv_domain *domain;
+	struct libnet_UserInfo *user_info;
+	char *user_dom, *user_name;
+	bool ok;
+
+	state->ctx->status = wb_name2domain_recv(ctx, &domain);
+	if(!composite_is_ok(state->ctx)) return;
+
+	user_info = talloc(state, struct libnet_UserInfo);
+	if (composite_nomem(user_info, state->ctx)) return;
+
+	ok= wb_samba3_split_username(state, state->name, &user_dom, &user_name);
+	if(!ok){
+		composite_error(state->ctx, NT_STATUS_OBJECT_NAME_INVALID);
+		return;
+	}
+
+	user_info->in.user_name = user_name;
+	user_info->in.domain_name = domain->libnet_ctx->samr.name;
+	state->workgroup_name = talloc_strdup(state,
+			domain->libnet_ctx->samr.name);
+	if(composite_nomem(state->workgroup_name, state->ctx)) return;
+
+	ctx = libnet_UserInfo_send(domain->libnet_ctx, state, user_info, NULL);
+
+	composite_continue(state->ctx, ctx, cmd_getpwnam_recv_user_info, state);
+}
+
+static void cmd_getpwnam_recv_user_info(struct composite_context *ctx)
+{
+	struct cmd_getpwnam_state *state = talloc_get_type(
+			ctx->async.private_data, struct cmd_getpwnam_state);
+	struct libnet_UserInfo *user_info;
+	struct winbindd_pw *pw;
+
+	DEBUG(5, ("cmd_getpwnam_recv_user_info called\n"));
+
+	user_info = talloc(state, struct libnet_UserInfo);
+	if(composite_nomem(user_info, state->ctx)) return;
+
+	pw = talloc(state, struct winbindd_pw);
+	if(composite_nomem(pw, state->ctx)) return;
+
+	state->ctx->status = libnet_UserInfo_recv(ctx, state, user_info);
+	if(!composite_is_ok(state->ctx)) return;
+
+	WBSRV_SAMBA3_SET_STRING(pw->pw_name, user_info->out.account_name);
+	WBSRV_SAMBA3_SET_STRING(pw->pw_passwd, "*");
+	WBSRV_SAMBA3_SET_STRING(pw->pw_gecos, user_info->out.full_name);
+	WBSRV_SAMBA3_SET_STRING(pw->pw_dir, lp_template_homedir());
+	all_string_sub(pw->pw_dir, "%WORKGROUP%", state->workgroup_name,
+			sizeof(fstring) - 1);
+	all_string_sub(pw->pw_dir, "%ACCOUNTNAME%", user_info->out.account_name,
+			sizeof(fstring) - 1);
+	WBSRV_SAMBA3_SET_STRING(pw->pw_shell, lp_template_shell());
+
+	state->group_sid = dom_sid_dup(state, user_info->out.primary_group_sid);
+	if(composite_nomem(state->group_sid, state->ctx)) return;
+
+	state->result = pw;
+
+	ctx = wb_sid2uid_send(state, state->service, user_info->out.user_sid);
+	composite_continue(state->ctx, ctx, cmd_getpwnam_recv_uid, state);
+}
+
+static void cmd_getpwnam_recv_uid(struct composite_context *ctx)
+{
+	struct cmd_getpwnam_state *state = talloc_get_type(
+			ctx->async.private_data, struct cmd_getpwnam_state);
+	uid_t uid;
+
+	DEBUG(5, ("cmd_getpwnam_recv_uid called\n"));
+
+	state->ctx->status = wb_sid2uid_recv(ctx, &uid);
+	if(!composite_is_ok(state->ctx)) return;
+
+	state->result->pw_uid = uid;
+
+	ctx = wb_sid2gid_send(state, state->service, state->group_sid);
+	composite_continue(state->ctx, ctx, cmd_getpwnam_recv_gid, state);
+}
+
+static void cmd_getpwnam_recv_gid(struct composite_context *ctx)
+{
+	struct cmd_getpwnam_state *state = talloc_get_type(
+			ctx->async.private_data, struct cmd_getpwnam_state);
+	gid_t gid;
+
+	DEBUG(5, ("cmd_getpwnam_recv_gid called\n"));
+
+	state->ctx->status = wb_sid2gid_recv(ctx, &gid);
+	if(!composite_is_ok(state->ctx)) return;
+
+	state->result->pw_gid = gid;
+
+	composite_done(state->ctx);
+}
+
+NTSTATUS wb_cmd_getpwnam_recv(struct composite_context *ctx,
+		TALLOC_CTX *mem_ctx, struct winbindd_pw **pw)
+{
+	NTSTATUS status = composite_wait(ctx);
+
+	DEBUG(5, ("wb_cmd_getpwnam_recv called\n"));
+
+	if (NT_STATUS_IS_OK(status)) {
+		struct cmd_getpwnam_state *state =
+			talloc_get_type(ctx->private_data,
+					struct cmd_getpwnam_state);
+		*pw = 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-13 15:41:31 UTC (rev 24369)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c	2007-08-13 15:49:09 UTC (rev 24370)
@@ -644,13 +644,43 @@
 
 /* NSS calls */
 
+static void getpwnam_recv(struct composite_context *ctx);
+
 NTSTATUS wbsrv_samba3_getpwnam(struct wbsrv_samba3_call *s3call)
 {
+	struct composite_context *ctx;
+	struct wbsrv_service *service =
+		s3call->wbconn->listen_socket->service;
+
 	DEBUG(5, ("wbsrv_samba3_getpwnam called\n"));
-	s3call->response.result = WINBINDD_ERROR;
+
+	ctx = wb_cmd_getpwnam_send(s3call, service,
+			s3call->request.data.username);
+	NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+	ctx->async.fn = getpwnam_recv;
+	ctx->async.private_data = s3call;
+	s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
 	return NT_STATUS_OK;
 }
 
+static void getpwnam_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_pw *pw;
+
+	DEBUG(5, ("getpwnam_recv called\n"));
+
+	status = wb_cmd_getpwnam_recv(ctx, s3call, &pw);
+	if(NT_STATUS_IS_OK(status))
+		s3call->response.data.pw = *pw;
+
+	wbsrv_samba3_async_epilogue(status, s3call);
+}
+
 NTSTATUS wbsrv_samba3_getpwuid(struct wbsrv_samba3_call *s3call)
 {
 	DEBUG(5, ("wbsrv_samba3_getpwuid called\n"));



More information about the samba-cvs mailing list