sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

winbind: Go throught wb_getpwsid for listing users

Browse Source 
This makes sure we get the same results for getpwnam and getpwent.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Volker Lendecke 2016-12-29 19:05:40 +00:00
parent 901d2bd99b
commit c4e9ec55f1
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/winbindd/wb_next_pwent.c
View File

@ -20,11 +20,13 @@
#include "includes.h"
#include "winbindd.h"
#include "librpc/gen_ndr/ndr_winbind_c.h"
#include "libcli/security/dom_sid.h"
#include "passdb/machine_sid.h"
struct wb_next_pwent_state {
struct tevent_context *ev;
struct getpwent_state *gstate;
struct dom_sid next_sid;
struct winbindd_pw *pw;
};
@ -36,8 +38,9 @@ static void wb_next_pwent_send_do(struct tevent_req *req,
{
struct tevent_req *subreq;
if (state->gstate->next_user >= state->gstate->num_users) {
TALLOC_FREE(state->gstate->users);
if (state->gstate->next_user >= state->gstate->rids.num_rids) {
TALLOC_FREE(state->gstate->rids.rids);
state->gstate->rids.num_rids = 0;
state->gstate->domain = wb_next_domain(state->gstate->domain);
if (state->gstate->domain == NULL) {
@ -45,8 +48,10 @@ static void wb_next_pwent_send_do(struct tevent_req *req,
return;
}
subreq = wb_query_user_list_send(state, state->ev,
state->gstate->domain);
subreq = dcerpc_wbint_QueryUserRidList_send(
state, state->ev,
dom_child_handle(state->gstate->domain),
&state->gstate->rids);
if (tevent_req_nomem(subreq, req)) {
return;
}
@ -55,9 +60,11 @@ static void wb_next_pwent_send_do(struct tevent_req *req,
return;
}
subreq = wb_fill_pwent_send(state, state->ev,
&state->gstate->users[state->gstate->next_user],
state->pw);
sid_compose(&state->next_sid, &state->gstate->domain->sid,
state->gstate->rids.rids[state->gstate->next_user]);
subreq = wb_getpwsid_send(state, state->ev, &state->next_sid,
state->pw);
if (tevent_req_nomem(subreq, req)) {
return;
}
@ -95,18 +102,17 @@ static void wb_next_pwent_fetch_done(struct tevent_req *subreq)
subreq, struct tevent_req);
struct wb_next_pwent_state *state = tevent_req_data(
req, struct wb_next_pwent_state);
NTSTATUS status;
NTSTATUS status, result;
status = wb_query_user_list_recv(subreq, state->gstate,
&state->gstate->num_users,
&state->gstate->users);
status = dcerpc_wbint_QueryUserRidList_recv(subreq, state->gstate,
&result);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
if (any_nt_status_not_ok(status, result, &status)) {
/* Ignore errors here, just log it */
DEBUG(10, ("query_user_list for domain %s returned %s\n",
state->gstate->domain->name,
nt_errstr(status)));
state->gstate->num_users = 0;
state->gstate->rids.num_rids = 0;
}
state->gstate->next_user = 0;
@ -122,13 +128,13 @@ static void wb_next_pwent_fill_done(struct tevent_req *subreq)
req, struct wb_next_pwent_state);
NTSTATUS status;
status = wb_fill_pwent_recv(subreq);
status = wb_getpwsid_recv(subreq);
TALLOC_FREE(subreq);
/*
* When you try to enumerate users with 'getent passwd' and the user
* doesn't have a uid set we should just move on.
*/
if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
state->gstate->next_user += 1;
wb_next_pwent_send_do(req, state);

5
source3/winbindd/winbindd.h
View File

@ -75,9 +75,8 @@ struct winbindd_cli_state {
struct getpwent_state {
struct winbindd_domain *domain;
int next_user;
int num_users;
struct wbint_userinfo *users;
uint32_t next_user;
struct wbint_RidArray rids;
};
struct getgrent_state {