svn commit: samba r24483 - in branches/SAMBA_4_0/source/winbind: .
kai at samba.org
kai at samba.org
Thu Aug 16 10:40:05 GMT 2007
Author: kai
Date: 2007-08-16 10:40:04 +0000 (Thu, 16 Aug 2007)
New Revision: 24483
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24483
Log:
Implement backend for wbinfo -u (list users)
Added:
branches/SAMBA_4_0/source/winbind/wb_cmd_list_users.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_samba3_protocol.c
Changeset:
Modified: branches/SAMBA_4_0/source/winbind/config.mk
===================================================================
--- branches/SAMBA_4_0/source/winbind/config.mk 2007-08-16 10:07:19 UTC (rev 24482)
+++ branches/SAMBA_4_0/source/winbind/config.mk 2007-08-16 10:40:04 UTC (rev 24483)
@@ -30,6 +30,7 @@
wb_cmd_userdomgroups.o \
wb_cmd_usersids.o \
wb_cmd_list_trustdom.o \
+ wb_cmd_list_users.o \
wb_pam_auth.o \
wb_sam_logon.o
PRIVATE_DEPENDENCIES = \
Added: branches/SAMBA_4_0/source/winbind/wb_cmd_list_users.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_cmd_list_users.c 2007-08-16 10:07:19 UTC (rev 24482)
+++ branches/SAMBA_4_0/source/winbind/wb_cmd_list_users.c 2007-08-16 10:40:04 UTC (rev 24483)
@@ -0,0 +1,199 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Command backend for wbinfo -u
+
+ 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_list_users_state {
+ struct composite_context *ctx;
+ struct wbsrv_service *service;
+
+ struct wbsrv_domain *domain;
+ char *domain_name;
+ uint resume_index;
+ char *result;
+};
+
+static void cmd_list_users_recv_domain(struct composite_context *ctx);
+static void cmd_list_users_recv_user_list(struct composite_context *ctx);
+
+struct composite_context *wb_cmd_list_users_send(TALLOC_CTX *mem_ctx,
+ struct wbsrv_service *service, const char *domain_name)
+{
+ struct composite_context *ctx, *result;
+ struct cmd_list_users_state *state;
+
+ DEBUG(5, ("wb_cmd_list_users_send called\n"));
+
+ result = composite_create(mem_ctx, service->task->event_ctx);
+ if (!result) return NULL;
+
+ state = talloc(result, struct cmd_list_users_state);
+ if (composite_nomem(state, result)) return result;
+
+ state->ctx = result;
+ result->private_data = state;
+ state->service = service;
+ state->resume_index = 0;
+ state->result = talloc_strdup(state, "");
+ if (composite_nomem(state->result, state->ctx)) return result;
+
+ /*FIXME: We should look up the domain in the winbind request if it is
+ * set, not just take the primary domain. However, I want to get the
+ * libnet logic to work first. */
+
+ if (domain_name && *domain_name != '\0') {
+ state->domain_name = talloc_strdup(state, domain_name);
+ if (composite_nomem(state->domain_name, state->ctx))
+ return result;
+ } else {
+ state->domain_name = NULL;
+ }
+
+ ctx = wb_sid2domain_send(state, service, service->primary_sid);
+ if (composite_nomem(ctx, state->ctx)) return result;
+
+ composite_continue(state->ctx, ctx, cmd_list_users_recv_domain, state);
+ return result;
+}
+
+static void cmd_list_users_recv_domain(struct composite_context *ctx)
+{
+ struct cmd_list_users_state *state = talloc_get_type(
+ ctx->async.private_data, struct cmd_list_users_state);
+ struct wbsrv_domain *domain;
+ struct libnet_UserList *user_list;
+
+ DEBUG(5, ("cmd_list_users_recv_domain called\n"));
+
+ state->ctx->status = wb_sid2domain_recv(ctx, &domain);
+ if (!composite_is_ok(state->ctx)) return;
+
+ state->domain = domain;
+
+ /* If this is non-null, we've looked up the domain given in the winbind
+ * request, otherwise we'll just use the default name.*/
+ if (state->domain_name == NULL) {
+ state->domain_name = talloc_strdup(state,
+ domain->libnet_ctx->samr.name);
+ if (composite_nomem(state->domain_name, state->ctx)) return;
+ }
+
+ user_list = talloc(state, struct libnet_UserList);
+ if (composite_nomem(user_list, state->ctx)) return;
+
+ user_list->in.domain_name = state->domain_name;
+
+ /* Rafal suggested that 128 is a good number here. I don't like magic
+ * numbers too much, but for now it'll have to do.
+ */
+ user_list->in.page_size = 128;
+ user_list->in.resume_index = state->resume_index;
+
+ ctx = libnet_UserList_send(domain->libnet_ctx, state, user_list, NULL);
+
+ composite_continue(state->ctx, ctx, cmd_list_users_recv_user_list,
+ state);
+}
+
+static void cmd_list_users_recv_user_list(struct composite_context *ctx)
+{
+ struct cmd_list_users_state *state = talloc_get_type(
+ ctx->async.private_data, struct cmd_list_users_state);
+ struct libnet_UserList *user_list;
+ NTSTATUS status;
+ int i;
+
+ DEBUG(5, ("cmd_list_users_recv_user_list called\n"));
+
+ user_list = talloc(state, struct libnet_UserList);
+ if (composite_nomem(user_list, state->ctx)) return;
+
+ status = libnet_UserList_recv(ctx, state, user_list);
+
+ /* If NTSTATUS is neither OK nor MORE_ENTRIES, something broke */
+ if (!NT_STATUS_IS_OK(status) &&
+ !NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
+ composite_error(state->ctx, status);
+ return;
+ }
+
+ for (i = 0; i < user_list->out.count; ++i) {
+ DEBUG(5, ("Appending user '%s'\n", user_list->out.users[i].username));
+ state->result = talloc_asprintf_append(state->result, "%s,",
+ user_list->out.users[i].username);
+ }
+
+ /* If the status is OK, we're finished, there's no more users.
+ * So we'll trim off the trailing ',' and are done.*/
+ if (NT_STATUS_IS_OK(status)) {
+ int str_len = strlen(state->result);
+ DEBUG(1, ("list_UserList_recv returned NT_STATUS_OK\n"));
+ state->result[str_len - 1] = '\0';
+ composite_done(state->ctx);
+ return;
+ }
+
+ DEBUG(5, ("list_UserList_recv returned NT_STATUS_MORE_ENTRIES\n"));
+
+ /* Otherwise there's more users to get, so call out to libnet and
+ * continue on this function here. */
+
+ user_list->in.domain_name = state->domain_name;
+ /* See comment above about the page size. 128 seems like a good default.
+ */
+ user_list->in.page_size = 128;
+ user_list->in.resume_index = user_list->out.resume_index;
+
+ ctx = libnet_UserList_send(state->domain->libnet_ctx, state, user_list,
+ NULL);
+
+ composite_continue(state->ctx, ctx, cmd_list_users_recv_user_list,
+ state);
+}
+
+NTSTATUS wb_cmd_list_users_recv(struct composite_context *ctx,
+ TALLOC_CTX *mem_ctx, uint32_t *extra_data_len,
+ char **extra_data)
+{
+ NTSTATUS status = composite_wait(ctx);
+
+ DEBUG(5, ("wb_cmd_list_users_recv called\n"));
+
+ if (NT_STATUS_IS_OK(status)) {
+ struct cmd_list_users_state *state = talloc_get_type(
+ ctx->private_data, struct cmd_list_users_state);
+
+ *extra_data_len = strlen(state->result);
+ *extra_data = 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-16 10:07:19 UTC (rev 24482)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c 2007-08-16 10:40:04 UTC (rev 24483)
@@ -642,6 +642,51 @@
wbsrv_samba3_async_epilogue(status, s3call);
}
+
+/* List users */
+
+static void list_users_recv(struct composite_context *ctx);
+
+NTSTATUS wbsrv_samba3_list_users(struct wbsrv_samba3_call *s3call)
+{
+ struct composite_context *ctx;
+ struct wbsrv_service *service =
+ s3call->wbconn->listen_socket->service;
+
+ DEBUG(5, ("wbsrv_samba3_list_users called\n"));
+
+ ctx = wb_cmd_list_users_send(s3call, service,
+ s3call->request.domain_name);
+ NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+ ctx->async.fn = list_users_recv;
+ ctx->async.private_data = s3call;
+ s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC;
+ return NT_STATUS_OK;
+}
+
+static void list_users_recv(struct composite_context *ctx)
+{
+ struct wbsrv_samba3_call *s3call =
+ talloc_get_type(ctx->async.private_data,
+ struct wbsrv_samba3_call);
+ uint32_t extra_data_len;
+ uint8_t *extra_data;
+ NTSTATUS status;
+
+ DEBUG(5, ("list_users_recv called\n"));
+
+ status = wb_cmd_list_users_recv(ctx, s3call, &extra_data_len,
+ &extra_data);
+
+ if (NT_STATUS_IS_OK(status)) {
+ s3call->response.extra_data.data = extra_data;
+ s3call->response.length += extra_data_len;
+ }
+
+ wbsrv_samba3_async_epilogue(status, s3call);
+}
+
/* NSS calls */
static void getpwnam_recv(struct composite_context *ctx);
Modified: branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c
===================================================================
--- branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c 2007-08-16 10:07:19 UTC (rev 24482)
+++ branches/SAMBA_4_0/source/winbind/wb_samba3_protocol.c 2007-08-16 10:40:04 UTC (rev 24483)
@@ -124,6 +124,9 @@
case WINBINDD_LIST_TRUSTDOM:
return wbsrv_samba3_list_trustdom(s3call);
+ case WINBINDD_LIST_USERS:
+ return wbsrv_samba3_list_users(s3call);
+
case WINBINDD_GETPWNAM:
return wbsrv_samba3_getpwnam(s3call);
@@ -178,7 +181,6 @@
case WINBINDD_PAM_CHAUTHTOK:
case WINBINDD_PAM_LOGOFF:
case WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP:
- case WINBINDD_LIST_USERS:
case WINBINDD_LIST_GROUPS:
case WINBINDD_LOOKUPRIDS:
case WINBINDD_SIDS_TO_XIDS:
More information about the samba-cvs
mailing list