#include "includes.h"
#include "winbindd.h"
-#include "librpc/gen_ndr/ndr_wbint_c.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;
};
static void wb_next_pwent_fetch_done(struct tevent_req *subreq);
static void wb_next_pwent_fill_done(struct tevent_req *subreq);
-static struct winbindd_domain *wb_next_find_domain(struct winbindd_domain *domain)
+static void wb_next_pwent_send_do(struct tevent_req *req,
+ struct wb_next_pwent_state *state)
{
- if (domain == NULL) {
- domain = domain_list();
- } else {
- domain = domain->next;
+ struct tevent_req *subreq;
+
+ 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) {
+ tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
+ return;
+ }
+
+ subreq = dcerpc_wbint_QueryUserRidList_send(
+ state, state->ev,
+ dom_child_handle(state->gstate->domain),
+ &state->gstate->rids);
+ if (tevent_req_nomem(subreq, req)) {
+ return;
+ }
+
+ tevent_req_set_callback(subreq, wb_next_pwent_fetch_done, req);
+ return;
}
- if ((domain != NULL)
- && sid_check_is_domain(&domain->sid)) {
- domain = domain->next;
+ 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;
}
- return domain;
+
+ tevent_req_set_callback(subreq, wb_next_pwent_fill_done, req);
}
struct tevent_req *wb_next_pwent_send(TALLOC_CTX *mem_ctx,
struct getpwent_state *gstate,
struct winbindd_pw *pw)
{
- struct tevent_req *req, *subreq;
+ struct tevent_req *req;
struct wb_next_pwent_state *state;
req = tevent_req_create(mem_ctx, &state, struct wb_next_pwent_state);
state->gstate = gstate;
state->pw = pw;
- if (state->gstate->next_user >= state->gstate->num_users) {
- TALLOC_FREE(state->gstate->users);
-
- state->gstate->domain = wb_next_find_domain(state->gstate->domain);
- if (state->gstate->domain == NULL) {
- tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
- return tevent_req_post(req, ev);
- }
- subreq = wb_query_user_list_send(state, state->ev,
- state->gstate->domain);
- if (tevent_req_nomem(subreq, req)) {
- return tevent_req_post(req, ev);
- }
- tevent_req_set_callback(subreq, wb_next_pwent_fetch_done, req);
- return req;
- }
-
- subreq = wb_fill_pwent_send(
- state, state->ev,
- &state->gstate->users[state->gstate->next_user],
- state->pw);
- if (tevent_req_nomem(subreq, req)) {
+ wb_next_pwent_send_do(req, state);
+ if (!tevent_req_is_in_progress(req)) {
return tevent_req_post(req, ev);
}
- tevent_req_set_callback(subreq, wb_next_pwent_fill_done, req);
+
return req;
}
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;
- }
-
- if (state->gstate->num_users == 0) {
- state->gstate->domain = state->gstate->domain->next;
-
- if ((state->gstate->domain != NULL)
- && sid_check_is_domain(&state->gstate->domain->sid)) {
- state->gstate->domain = state->gstate->domain->next;
- }
-
- if (state->gstate->domain == NULL) {
- tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
- return;
- }
- subreq = wb_query_user_list_send(state, state->ev,
- state->gstate->domain);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, wb_next_pwent_fetch_done, req);
- return;
+ state->gstate->rids.num_rids = 0;
}
state->gstate->next_user = 0;
- subreq = wb_fill_pwent_send(
- state, state->ev,
- &state->gstate->users[state->gstate->next_user],
- state->pw);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, wb_next_pwent_fill_done, req);
+ wb_next_pwent_send_do(req, state);
}
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;
- if (state->gstate->next_user >= state->gstate->num_users) {
- TALLOC_FREE(state->gstate->users);
-
- state->gstate->domain = wb_next_find_domain(state->gstate->domain);
- if (state->gstate->domain == NULL) {
- tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES);
- return;
- }
-
- subreq = wb_query_user_list_send(state, state->ev,
- state->gstate->domain);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, wb_next_pwent_fetch_done, req);
- return;
- }
-
- subreq = wb_fill_pwent_send(state,
- state->ev,
- &state->gstate->users[state->gstate->next_user],
- state->pw);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, wb_next_pwent_fill_done, req);
+ wb_next_pwent_send_do(req, state);
return;
} else if (tevent_req_nterror(req, status)) {
git.samba.org / samba.git / blobdiff