Author: kai Date: 2007-08-20 11:51:01 +0000 (Mon, 20 Aug 2007) New Revision: 24577
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24577 Log: Implement basic getpwent. This one still cheats and only returns one winbindd_pw structure per call. Also, doesn't get a new libnet_UserList yet. Added: branches/SAMBA_4_0/source/winbind/wb_cmd_getpwent.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-20 11:41:36 UTC (rev 24576) +++ branches/SAMBA_4_0/source/winbind/config.mk 2007-08-20 11:51:01 UTC (rev 24577) @@ -32,6 +32,7 @@ wb_cmd_list_trustdom.o \ wb_cmd_list_users.o \ wb_cmd_setpwent.o \ + wb_cmd_getpwent.o \ wb_pam_auth.o \ wb_sam_logon.o PRIVATE_DEPENDENCIES = \ Added: branches/SAMBA_4_0/source/winbind/wb_cmd_getpwent.c =================================================================== --- branches/SAMBA_4_0/source/winbind/wb_cmd_getpwent.c 2007-08-20 11:41:36 UTC (rev 24576) +++ branches/SAMBA_4_0/source/winbind/wb_cmd_getpwent.c 2007-08-20 11:51:01 UTC (rev 24577) @@ -0,0 +1,129 @@ +/* + Unix SMB/CIFS implementation. + + Command backend for getpwent + + 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_getpwent_state { + struct composite_context *ctx; + struct wbsrv_service *service; + + struct wbsrv_pwent *pwent; + uint32_t max_users; + + uint32_t num_users; + struct winbindd_pw *result; +}; + +static void cmd_getpwent_recv_pwnam(struct composite_context *ctx); +#if 0 /*FIXME: implement this*/ +static void cmd_getpwent_recv_user_list(struct composite_context *ctx); +#endif + +struct composite_context *wb_cmd_getpwent_send(TALLOC_CTX *mem_ctx, + struct wbsrv_service *service, struct wbsrv_pwent *pwent, + uint32_t max_users) +{ + struct composite_context *ctx, *result; + struct cmd_getpwent_state *state; + + DEBUG(5, ("wb_cmd_getpwent_send called\n")); + + result = composite_create(mem_ctx, service->task->event_ctx); + if (!result) return NULL; + + state = talloc(mem_ctx, struct cmd_getpwent_state); + if (composite_nomem(state, result)) return result; + + state->ctx = result; + result->private_data = state; + state->service = service; + state->pwent = pwent; + state->max_users = max_users; + state->num_users = 0; + + /* If there are users left in the libnet_UserList and we're below the + * maximum number of users to get per winbind getpwent call, use + * getpwnam to get the winbindd_pw struct */ + if (pwent->page_index < pwent->user_list->out.count) { + int idx = pwent->page_index; + char *username = talloc_strdup(state, + pwent->user_list->out.users[idx].username); + + pwent->page_index++; + ctx = wb_cmd_getpwnam_send(state, service, username); + if (composite_nomem(ctx, state->ctx)) return result; + + composite_continue(state->ctx, ctx, cmd_getpwent_recv_pwnam, + state); + } else { + /* If there is no valid user left, call libnet_UserList to get a new + * list of users. */ + composite_error(state->ctx, NT_STATUS_NO_MORE_ENTRIES); + } + return result; +} + +static void cmd_getpwent_recv_pwnam(struct composite_context *ctx) +{ + struct cmd_getpwent_state *state = + talloc_get_type(ctx->async.private_data, + struct cmd_getpwent_state); + struct winbindd_pw *pw; + + DEBUG(5, ("cmd_getpwent_recv_pwnam called\n")); + + state->ctx->status = wb_cmd_getpwnam_recv(ctx, state, &pw); + if (!composite_is_ok(state->ctx)) return; + + /*FIXME: Cheat for now and only get one user per call */ + state->result = pw; + + composite_done(state->ctx); +} + +NTSTATUS wb_cmd_getpwent_recv(struct composite_context *ctx, + TALLOC_CTX *mem_ctx, struct winbindd_pw **pw, + uint32_t *num_users) +{ + NTSTATUS status = composite_wait(ctx); + + DEBUG(5, ("wb_cmd_getpwent_recv called\n")); + + if (NT_STATUS_IS_OK(status)) { + struct cmd_getpwent_state *state = + talloc_get_type(ctx->private_data, + struct cmd_getpwent_state); + *pw = talloc_steal(mem_ctx, state->result); + /*FIXME: Cheat and only get oner user */ + *num_users = 1; + } + + 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:41:36 UTC (rev 24576) +++ branches/SAMBA_4_0/source/winbind/wb_samba3_cmd.c 2007-08-20 11:51:01 UTC (rev 24577) @@ -798,13 +798,55 @@ wbsrv_samba3_async_epilogue(status, s3call); } +static void getpwent_recv(struct composite_context *ctx); + NTSTATUS wbsrv_samba3_getpwent(struct wbsrv_samba3_call *s3call) { + struct composite_context *ctx; + struct wbsrv_service *service = s3call->wbconn->listen_socket->service; + struct wbsrv_pwent *pwent; + DEBUG(5, ("wbsrv_samba3_getpwent called\n")); - s3call->response.result = WINBINDD_ERROR; + + NT_STATUS_HAVE_NO_MEMORY(s3call->wbconn->protocol_private_data); + + pwent = talloc_get_type(s3call->wbconn->protocol_private_data, + struct wbsrv_pwent); + NT_STATUS_HAVE_NO_MEMORY(pwent); + + ctx = wb_cmd_getpwent_send(s3call, service, pwent, + s3call->request.data.num_entries); + NT_STATUS_HAVE_NO_MEMORY(ctx); + + ctx->async.fn = getpwent_recv; + ctx->async.private_data = s3call; + s3call->flags |= WBSRV_CALL_FLAGS_REPLY_ASYNC; return NT_STATUS_OK; } +static void getpwent_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; + uint32_t num_users; + + DEBUG(5, ("getpwent_recv called\n")); + + status = wb_cmd_getpwent_recv(ctx, s3call, &pw, &num_users); + if (NT_STATUS_IS_OK(status)) { + uint32_t extra_len = sizeof(struct winbindd_pw) * num_users; + + s3call->response.data.num_entries = num_users; + s3call->response.extra_data.data = pw; + s3call->response.length += extra_len; + } + + wbsrv_samba3_async_epilogue(status, s3call); +} + NTSTATUS wbsrv_samba3_endpwent(struct wbsrv_samba3_call *s3call) { struct wbsrv_pwent *pwent =
