return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
}
+/* Constants and helper functions for determining domain trust types */
+
+enum trust_type {
+ EXTERNAL = 0,
+ FOREST,
+ IN_FOREST,
+ NONE,
+};
+
+const char *trust_type_strings[] = {"External",
+ "Forest",
+ "In Forest",
+ "None"};
+
+static enum trust_type get_trust_type(struct winbindd_tdc_domain *domain)
+{
+ if (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN)
+ return EXTERNAL;
+ else if (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE)
+ return FOREST;
+ else if (((domain->trust_flags & NETR_TRUST_FLAG_IN_FOREST) == NETR_TRUST_FLAG_IN_FOREST) &&
+ ((domain->trust_flags & NETR_TRUST_FLAG_PRIMARY) == 0x0))
+ return IN_FOREST;
+ return NONE;
+}
+
+static const char *get_trust_type_string(struct winbindd_tdc_domain *domain)
+{
+ return trust_type_strings[get_trust_type(domain)];
+}
+
+static bool trust_is_inbound(struct winbindd_tdc_domain *domain)
+{
+ return (domain->trust_flags == 0x0) ||
+ ((domain->trust_flags & NETR_TRUST_FLAG_IN_FOREST) ==
+ NETR_TRUST_FLAG_IN_FOREST) ||
+ ((domain->trust_flags & NETR_TRUST_FLAG_INBOUND) ==
+ NETR_TRUST_FLAG_INBOUND);
+}
+
+static bool trust_is_outbound(struct winbindd_tdc_domain *domain)
+{
+ return (domain->trust_flags == 0x0) ||
+ ((domain->trust_flags & NETR_TRUST_FLAG_IN_FOREST) ==
+ NETR_TRUST_FLAG_IN_FOREST) ||
+ ((domain->trust_flags & NETR_TRUST_FLAG_OUTBOUND) ==
+ NETR_TRUST_FLAG_OUTBOUND);
+}
+
+static bool trust_is_transitive(struct winbindd_tdc_domain *domain)
+{
+ if ((domain->trust_attribs == NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE) ||
+ (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN) ||
+ (domain->trust_attribs == NETR_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL))
+ return False;
+ return True;
+}
+
void winbindd_list_trusted_domains(struct winbindd_cli_state *state)
{
- struct winbindd_domain *d = NULL;
+ struct winbindd_tdc_domain *dom_list = NULL;
+ struct winbindd_tdc_domain *d = NULL;
+ size_t num_domains = 0;
int extra_data_len = 0;
char *extra_data = NULL;
+ int i = 0;
DEBUG(3, ("[%5lu]: list trusted domains\n",
(unsigned long)state->pid));
- for ( d=domain_list(); d; d=d->next ) {
+ if( !wcache_tdc_fetch_list( &dom_list, &num_domains )) {
+ request_error(state);
+ goto done;
+ }
+
+ for ( i = 0; i < num_domains; i++ ) {
+ struct winbindd_domain *domain;
+ bool is_online = true;
+
+ d = &dom_list[i];
+ domain = find_domain_from_name_noinit(d->domain_name);
+ if (domain) {
+ is_online = domain->online;
+ }
+
if ( !extra_data ) {
- extra_data = talloc_asprintf(state->mem_ctx, "%s\\%s\\%s",
- d->name,
- d->alt_name ? d->alt_name : d->name,
- sid_string_static(&d->sid));
+ extra_data = talloc_asprintf(state->mem_ctx,
+ "%s\\%s\\%s\\%s\\%s\\%s\\%s\\%s",
+ d->domain_name,
+ d->dns_name ? d->dns_name : d->domain_name,
+ sid_string_talloc(state->mem_ctx, &d->sid),
+ get_trust_type_string(d),
+ trust_is_transitive(d) ? "Yes" : "No",
+ trust_is_inbound(d) ? "Yes" : "No",
+ trust_is_outbound(d) ? "Yes" : "No",
+ is_online ? "Online" : "Offline" );
} else {
- extra_data = talloc_asprintf(state->mem_ctx, "%s\n%s\\%s\\%s",
+ extra_data = talloc_asprintf(state->mem_ctx,
+ "%s\n%s\\%s\\%s\\%s\\%s\\%s\\%s\\%s",
extra_data,
- d->name,
- d->alt_name ? d->alt_name : d->name,
- sid_string_static(&d->sid));
+ d->domain_name,
+ d->dns_name ? d->dns_name : d->domain_name,
+ sid_string_talloc(state->mem_ctx, &d->sid),
+ get_trust_type_string(d),
+ trust_is_transitive(d) ? "Yes" : "No",
+ trust_is_inbound(d) ? "Yes" : "No",
+ trust_is_outbound(d) ? "Yes" : "No",
+ is_online ? "Online" : "Offline" );
}
}
state->response.length += extra_data_len+1;
}
- TALLOC_FREE( extra_data );
-
request_ok(state);
+done:
+ TALLOC_FREE( dom_list );
+ TALLOC_FREE( extra_data );
}
-enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *domain,
- struct winbindd_cli_state *state)
+static void ndr_child_trust_compat_list(struct winbindd_domain *domain,
+ struct winbindd_cli_state *state,
+ struct winbind_trust *r)
{
- uint32 i, num_domains;
+ uint32_t i, num_domains;
char **names, **alt_names;
DOM_SID *sids;
- int extra_data_len = 0;
- char *extra_data;
NTSTATUS result;
bool have_own_domain = False;
+ struct winbind_domain_info_compat *t;
- DEBUG(3, ("[%5lu]: list trusted domains\n",
- (unsigned long)state->pid));
+ DEBUG(3, ("list trusted domains\n"));
result = domain->methods->trusted_domains(domain, state->mem_ctx,
&num_domains, &names,
if (!NT_STATUS_IS_OK(result)) {
DEBUG(3, ("winbindd_dual_list_trusted_domains: trusted_domains returned %s\n",
nt_errstr(result) ));
- return WINBINDD_ERROR;
+ r->out.result = WINBIND_STATUS_FOOBAR;
+ return;
}
- extra_data = talloc_strdup(state->mem_ctx, "");
-
- if (num_domains > 0)
- extra_data = talloc_asprintf(state->mem_ctx, "%s\\%s\\%s",
- names[0],
- alt_names[0] ? alt_names[0] : names[0],
- sid_string_static(&sids[0]));
+ t = talloc_array(r->out.rep,
+ struct winbind_domain_info_compat,
+ num_domains + 1);
+ if (!t) {
+ r->out.result = WINBIND_STATUS_NO_MEMORY;
+ return;
+ }
- for (i=1; i<num_domains; i++)
- extra_data = talloc_asprintf(state->mem_ctx, "%s\n%s\\%s\\%s",
- extra_data,
- names[i],
- alt_names[i] ? alt_names[i] : names[i],
- sid_string_static(&sids[i]));
- /* add our primary domain */
-
for (i=0; i<num_domains; i++) {
+ t[i].netbios_name = names[i];
+ t[i].dns_name = alt_names[i] ?
+ alt_names[i] :
+ names[i];
+ t[i].sid = &sids[i];
+ /* TODO: fill this in */
+ t[i].is_native_mode = false;
+ t[i].is_active_directory= false;
+ t[i].is_primary = false;
+
if (strequal(names[i], domain->name)) {
have_own_domain = True;
- break;
+ t[i].is_native_mode = domain->native_mode;
+ t[i].is_active_directory= domain->active_directory;
+ t[i].is_primary = domain->primary;
}
}
- if (state->request.data.list_all_domains && !have_own_domain) {
- extra_data = talloc_asprintf(state->mem_ctx, "%s\n%s\\%s\\%s",
- extra_data,
- domain->name,
- domain->alt_name ? domain->alt_name : domain->name,
- sid_string_static(&domain->sid));
+ /* add our primary domain */
+ if (!have_own_domain) {
+ t[i].netbios_name = domain->name;
+ t[i].dns_name = domain->alt_name ?
+ domain->alt_name :
+ domain->name;
+ t[i].sid = &domain->sid;
+ t[i].is_native_mode = domain->native_mode;
+ t[i].is_active_directory= domain->active_directory;
+ t[i].is_primary = domain->primary;
+ i++;
}
- /* This is a bit excessive, but the extra data sooner or later will be
- talloc'ed */
+ r->out.rep->compat_trusts.num_domains = i;
+ r->out.rep->compat_trusts.domains = t;
+ r->out.result = WINBIND_STATUS_OK;
+}
+
+void winbindd_ndr_domain_child_trust(struct winbindd_domain *domain,
+ struct winbindd_cli_state *state)
+{
+ struct winbind_trust *r;
- extra_data_len = 0;
- if (extra_data != NULL) {
- extra_data_len = strlen(extra_data);
+ r = talloc_get_type_abort(state->c.ndr.r,
+ struct winbind_trust);
+
+ switch (*r->in.level) {
+ case WINBIND_TRUST_LEVEL_COMPAT_LIST:
+ ndr_child_trust_compat_list(domain, state, r);
+ return;
}
- if (extra_data_len > 0) {
- state->response.extra_data.data = SMB_STRDUP(extra_data);
- state->response.length += extra_data_len+1;
+ r->out.result = WINBIND_STATUS_UNKNOWN_LEVEL;
+ return;
+}
+
+static void winbindd_getdcname_recv(void *private_data,
+ bool success,
+ struct winbind_get_dc_info *r)
+{
+ struct winbindd_cli_state *state =
+ talloc_get_type_abort(private_data, struct winbindd_cli_state);
+
+ if (!success) {
+ request_error(state);
+ return;
}
- return WINBINDD_OK;
+ fstrcpy(state->response.data.dc_name, r->out.dc_info->name);
+
+ request_ok(state);
}
void winbindd_getdcname(struct winbindd_cli_state *state)
{
struct winbindd_domain *domain;
+ struct winbind_get_dc_info *r;
state->request.domain_name
[sizeof(state->request.domain_name)-1] = '\0';
return;
}
- sendto_domain(state, find_our_domain());
+ r = TALLOC_P(state->mem_ctx, struct winbind_get_dc_info);
+ if (!r) goto nomem;
+ r->in.level = TALLOC_P(r, enum winbind_dc_info_level);
+ if (!r->in.level) goto nomem;
+
+ *r->in.level = WINBIND_DC_INFO_LEVEL_COMPAT_NT4;
+ r->in.domain_name = state->request.domain_name;
+
+ winbindd_get_dc_info_async_domain(state->mem_ctx, find_our_domain(),
+ r, winbindd_getdcname_recv, state);
+ return;
+nomem:
+ request_error(state);
+ return;
+}
+
+static void winbindd_get_dc_info_recv(TALLOC_CTX *mem_ctx, bool success,
+ struct winbindd_ndr_call *c,
+ void *_r,
+ void *_cont,
+ void *private_data)
+{
+ void (*cont)(void *priv, bool succ, struct winbind_get_dc_info *r) =
+ (void (*)(void *, bool, struct winbind_get_dc_info*))_cont;
+ struct winbind_get_dc_info *r =
+ talloc_get_type_abort(_r, struct winbind_get_dc_info);
+
+ if (!success) {
+ DEBUG(5, ("Could not get dc_info\n"));
+ cont(private_data, False, r);
+ return;
+ }
+
+ if (r->out.result != WINBIND_STATUS_OK) {
+ DEBUG(5, ("get_dc_info returned an error:0x%08X\n",
+ r->out.result));
+ cont(private_data, False, r);
+ return;
+ }
+
+ cont(private_data, True, r);
}
-enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
- struct winbindd_cli_state *state)
+void winbindd_get_dc_info_async_domain(TALLOC_CTX *mem_ctx,
+ struct winbindd_domain *domain,
+ struct winbind_get_dc_info *r,
+ void (*cont)(void *private_data,
+ bool success,
+ struct winbind_get_dc_info *r),
+ void *private_data)
{
- fstring dcname_slash;
- char *p;
+ do_async_ndr_domain(mem_ctx, domain,
+ NDR_WINBIND_GET_DC_INFO, r,
+ winbindd_get_dc_info_recv, r,
+ (void *)cont, private_data);
+}
+
+void winbindd_get_dc_info_async_child(TALLOC_CTX *mem_ctx,
+ struct winbindd_child *child,
+ struct winbind_get_dc_info *r,
+ void (*cont)(void *private_data,
+ bool success,
+ struct winbind_get_dc_info *r),
+ void *private_data)
+{
+ do_async_ndr(mem_ctx, child,
+ NDR_WINBIND_GET_DC_INFO, r,
+ winbindd_get_dc_info_recv, r,
+ (void *)cont, private_data);
+}
+
+static void ndr_child_get_dc_info_comapt_nt4(struct winbindd_domain *domain,
+ struct winbindd_cli_state *state,
+ struct winbind_get_dc_info *r)
+{
+ const char *dcname_slash;
+ const char *p;
struct rpc_pipe_client *netlogon_pipe;
NTSTATUS result;
WERROR werr;
unsigned int orig_timeout;
struct winbindd_domain *req_domain;
- state->request.domain_name
- [sizeof(state->request.domain_name)-1] = '\0';
-
- DEBUG(3, ("[%5lu]: Get DC name for %s\n", (unsigned long)state->pid,
- state->request.domain_name));
+ DEBUG(3, ("Get DC name for '%s'\n", r->in.domain_name));
result = cm_connect_netlogon(domain, &netlogon_pipe);
if (!NT_STATUS_IS_OK(result)) {
DEBUG(1, ("Can't contact the NETLOGON pipe\n"));
- return WINBINDD_ERROR;
+ r->out.result = WINBIND_STATUS_FOOBAR;
+ return;
}
/* This call can take a long time - allow the server to time out.
orig_timeout = cli_set_timeout(netlogon_pipe->cli, 35000);
- req_domain = find_domain_from_name_noinit(state->request.domain_name);
+ /*
+ * if the requested domain name matches the current one
+ * we need to use GetDCName(), because GetAnyDCName() only
+ * works for trusted domains
+ */
+ req_domain = find_domain_from_name_noinit(r->in.domain_name);
if (req_domain == domain) {
- werr = rpccli_netlogon_getdcname(netlogon_pipe, state->mem_ctx,
- domain->dcname,
- state->request.domain_name,
- dcname_slash);
+ result = rpccli_netr_GetDcName(netlogon_pipe,
+ r,
+ domain->dcname,
+ r->in.domain_name,
+ &dcname_slash,
+ &werr);
} else {
- werr = rpccli_netlogon_getanydcname(netlogon_pipe, state->mem_ctx,
- domain->dcname,
- state->request.domain_name,
- dcname_slash);
+ result = rpccli_netr_GetAnyDCName(netlogon_pipe,
+ r,
+ domain->dcname,
+ r->in.domain_name,
+ &dcname_slash,
+ &werr);
}
/* And restore our original timeout. */
cli_set_timeout(netlogon_pipe->cli, orig_timeout);
+ if (!NT_STATUS_IS_OK(result)) {
+ DEBUG(5,("Error requesting DCname for domain %s: %s\n",
+ r->in.domain_name, nt_errstr(result)));
+ r->out.result = WINBIND_STATUS_FOOBAR;
+ return;
+ }
+
if (!W_ERROR_IS_OK(werr)) {
DEBUG(5, ("Error requesting DCname for domain %s: %s\n",
- state->request.domain_name, dos_errstr(werr)));
- return WINBINDD_ERROR;
+ r->in.domain_name, dos_errstr(werr)));
+ r->out.result = WINBIND_STATUS_FOOBAR;
+ return;
}
p = dcname_slash;
p+=1;
}
- fstrcpy(state->response.data.dc_name, p);
- return WINBINDD_OK;
+ r->out.dc_info->name = talloc_strdup(r, p);
+ if (!r->out.dc_info->name) {
+ r->out.result = WINBIND_STATUS_NO_MEMORY;
+ return;
+ }
+ r->out.result = WINBIND_STATUS_OK;
}
-static struct winbindd_child static_locator_child;
-
-void init_locator_child(void)
+void winbindd_ndr_domain_child_get_dc_info(struct winbindd_domain *domain,
+ struct winbindd_cli_state *state)
{
- setup_domain_child(NULL, &static_locator_child, "locator");
-}
+ struct winbind_get_dc_info *r;
-struct winbindd_child *locator_child(void)
-{
- return &static_locator_child;
-}
+ r = talloc_get_type_abort(state->c.ndr.r,
+ struct winbind_get_dc_info);
-void winbindd_dsgetdcname(struct winbindd_cli_state *state)
-{
- state->request.domain_name
- [sizeof(state->request.domain_name)-1] = '\0';
+ switch (*r->in.level) {
+ case WINBIND_DC_INFO_LEVEL_COMPAT_NT4:
+ ndr_child_get_dc_info_comapt_nt4(domain, state, r);
+ return;
- DEBUG(3, ("[%5lu]: DsGetDcName for %s\n", (unsigned long)state->pid,
- state->request.domain_name));
+ case WINBIND_DC_INFO_LEVEL_COMPAT_DS:
+ r->out.result = WINBIND_STATUS_INVALID_LEVEL;
+ return;
+ }
- sendto_child(state, locator_child());
+ r->out.result = WINBIND_STATUS_UNKNOWN_LEVEL;
+ return;
}
-enum winbindd_result winbindd_dual_dsgetdcname(struct winbindd_domain *domain,
- struct winbindd_cli_state *state)
+static void winbindd_get_domain_info_recv(TALLOC_CTX *mem_ctx, bool success,
+ struct winbindd_ndr_call *c,
+ void *_r,
+ void *_cont,
+ void *private_data)
{
- NTSTATUS result;
- struct DS_DOMAIN_CONTROLLER_INFO *info = NULL;
- const char *dc = NULL;
-
- state->request.domain_name
- [sizeof(state->request.domain_name)-1] = '\0';
-
- DEBUG(3, ("[%5lu]: DsGetDcName for %s\n", (unsigned long)state->pid,
- state->request.domain_name));
-
- result = DsGetDcName(state->mem_ctx, NULL, state->request.domain_name,
- NULL, NULL, state->request.flags, &info);
-
- if (!NT_STATUS_IS_OK(result)) {
- return WINBINDD_ERROR;
- }
-
- if (info->domain_controller_address) {
- dc = info->domain_controller_address;
- if ((dc[0] == '\\') && (dc[1] == '\\')) {
- dc += 2;
- }
- }
-
- if ((!dc || !is_ipaddress_v4(dc)) && info->domain_controller_name) {
- dc = info->domain_controller_name;
+ void (*cont)(void *priv, bool succ, struct winbind_get_domain_info *r) =
+ (void (*)(void *, bool, struct winbind_get_domain_info*))_cont;
+ struct winbind_get_domain_info *r =
+ talloc_get_type_abort(_r, struct winbind_get_domain_info);
+
+ if (!success) {
+ DEBUG(5, ("Could not get domain_info\n"));
+ cont(private_data, False, r);
+ return;
}
- if (!dc || !*dc) {
- return WINBINDD_ERROR;
+ if (r->out.result != WINBIND_STATUS_OK) {
+ DEBUG(5, ("get_domain_info returned an error:0x%08X\n",
+ r->out.result));
+ cont(private_data, False, r);
+ return;
}
- fstrcpy(state->response.data.dc_name, dc);
-
- return WINBINDD_OK;
+ cont(private_data, True, r);
}
+void winbindd_get_domain_info_async(TALLOC_CTX *mem_ctx,
+ struct winbindd_domain *domain,
+ struct winbind_get_domain_info *r,
+ void (*cont)(void *private_data,
+ bool success,
+ struct winbind_get_domain_info *r),
+ void *private_data)
+{
+ do_async_ndr_domain(mem_ctx, domain,
+ NDR_WINBIND_GET_DOMAIN_INFO, r,
+ winbindd_get_domain_info_recv, r,
+ (void *)cont, private_data);
+}
struct sequence_state {
- TALLOC_CTX *mem_ctx;
struct winbindd_cli_state *cli_state;
struct winbindd_domain *domain;
- struct winbindd_request *request;
- struct winbindd_response *response;
+ struct winbind_get_domain_info *r;
char *extra_data;
+ void (*recv_fn)(void *priv, bool succ,
+ struct winbind_get_domain_info *r);
};
-static void sequence_recv(void *private_data, bool success);
+static void sequence_one_recv(void *private_data, bool success,
+ struct winbind_get_domain_info *r);
+static void sequence_next_recv(void *private_data, bool success,
+ struct winbind_get_domain_info *r);
void winbindd_show_sequence(struct winbindd_cli_state *state)
{
/* Ensure null termination */
state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
+ seq = TALLOC_P(state->mem_ctx, struct sequence_state);
+ if (!seq) goto nomem;
+ seq->cli_state = state;
+ seq->extra_data = talloc_strdup(state->mem_ctx, "");
+ if (!seq->extra_data) goto nomem;
+ seq->r = TALLOC_P(seq, struct winbind_get_domain_info);
+ if (!seq->r) goto nomem;
+ seq->r->in.level = TALLOC_P(seq->r, enum winbind_domain_info_level);
+ if (!seq->r->in.level) goto nomem;
+
if (strlen(state->request.domain_name) > 0) {
- struct winbindd_domain *domain;
- domain = find_domain_from_name_noinit(
+ seq->domain = find_domain_from_name_noinit(
state->request.domain_name);
- if (domain == NULL) {
+ if (seq->domain == NULL) {
+ DEBUG(0,("domain '%s' not found\n",
+ state->request.domain_name));
request_error(state);
return;
}
- sendto_domain(state, domain);
- return;
+ seq->recv_fn = sequence_one_recv;
+ } else {
+ seq->domain = domain_list();
+ if (seq->domain == NULL) {
+ DEBUG(0, ("domain list empty\n"));
+ request_error(state);
+ return;
+ }
+ seq->recv_fn = sequence_next_recv;
}
- /* Ask all domains in sequence, collect the results in sequence_recv */
+ *seq->r->in.level = WINBIND_DOMAIN_INFO_LEVEL_SEQNUM;
+ seq->r->in.domain_name = seq->domain->name;
+ seq->r->in.dc_name = NULL;
- seq = TALLOC_P(state->mem_ctx, struct sequence_state);
- if (seq == NULL) {
- DEBUG(0, ("talloc failed\n"));
- request_error(state);
- return;
- }
+ winbindd_get_domain_info_async(seq, seq->domain, seq->r,
+ seq->recv_fn, seq);
+ return;
+nomem:
+ request_error(state);
+ return;
+}
- seq->mem_ctx = state->mem_ctx;
- seq->cli_state = state;
- seq->domain = domain_list();
- if (seq->domain == NULL) {
- DEBUG(0, ("domain list empty\n"));
- request_error(state);
- return;
- }
- seq->request = TALLOC_ZERO_P(state->mem_ctx,
- struct winbindd_request);
- seq->response = TALLOC_ZERO_P(state->mem_ctx,
- struct winbindd_response);
- seq->extra_data = talloc_strdup(state->mem_ctx, "");
+static void sequence_one_recv(void *private_data, bool success,
+ struct winbind_get_domain_info *r)
+{
+ struct sequence_state *state = talloc_get_type_abort(private_data,
+ struct sequence_state);
- if ((seq->request == NULL) || (seq->response == NULL) ||
- (seq->extra_data == NULL)) {
- DEBUG(0, ("talloc failed\n"));
- request_error(state);
+ if (!success) {
+ request_error(state->cli_state);
return;
}
- seq->request->length = sizeof(*seq->request);
- seq->request->cmd = WINBINDD_SHOW_SEQUENCE;
- fstrcpy(seq->request->domain_name, seq->domain->name);
+ state->cli_state->response.data.sequence_number =
+ state->r->out.domain_info->seqnum;
- async_domain_request(state->mem_ctx, seq->domain,
- seq->request, seq->response,
- sequence_recv, seq);
+ request_ok(state->cli_state);
}
-static void sequence_recv(void *private_data, bool success)
+static void sequence_next_recv(void *private_data, bool success,
+ struct winbind_get_domain_info *r)
{
- struct sequence_state *state =
- (struct sequence_state *)private_data;
- uint32 seq = DOM_SEQUENCE_NONE;
+ struct sequence_state *state = talloc_get_type_abort(private_data,
+ struct sequence_state);
+ uint64_t seq = DOM_SEQUENCE_NONE;
- if ((success) && (state->response->result == WINBINDD_OK))
- seq = state->response->data.sequence_number;
+ if (success) {
+ seq = state->r->out.domain_info->seqnum;
+ }
if (seq == DOM_SEQUENCE_NONE) {
- state->extra_data = talloc_asprintf(state->mem_ctx,
+ state->extra_data = talloc_asprintf(state,
"%s%s : DISCONNECTED\n",
state->extra_data,
state->domain->name);
} else {
- state->extra_data = talloc_asprintf(state->mem_ctx,
- "%s%s : %d\n",
+ state->extra_data = talloc_asprintf(state,
+ "%s%s : %lld\n",
state->extra_data,
- state->domain->name, seq);
+ state->domain->name,
+ (unsigned long long)seq);
}
state->domain->sequence_number = seq;
}
/* Ask the next domain */
- fstrcpy(state->request->domain_name, state->domain->name);
- async_domain_request(state->mem_ctx, state->domain,
- state->request, state->response,
- sequence_recv, state);
-}
-
-/* This is the child-only version of --sequence. It only allows for a single
- * domain (ie "our" one) to be displayed. */
-
-enum winbindd_result winbindd_dual_show_sequence(struct winbindd_domain *domain,
- struct winbindd_cli_state *state)
-{
- DEBUG(3, ("[%5lu]: show sequence\n", (unsigned long)state->pid));
-
- /* Ensure null termination */
- state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
+ *state->r->in.level = WINBIND_DOMAIN_INFO_LEVEL_SEQNUM;
+ state->r->in.domain_name= state->domain->name;
+ state->r->in.dc_name = NULL;
- domain->methods->sequence_number(domain, &domain->sequence_number);
-
- state->response.data.sequence_number =
- domain->sequence_number;
-
- return WINBINDD_OK;
+ winbindd_get_domain_info_async(state, state->domain, state->r,
+ state->recv_fn, state);
}
struct domain_info_state {
domain->name);
fstrcpy(state->response.data.domain_info.alt_name,
domain->alt_name);
- fstrcpy(state->response.data.domain_info.sid,
- sid_string_static(&domain->sid));
+ sid_to_fstring(state->response.data.domain_info.sid, &domain->sid);
state->response.data.domain_info.native_mode =
domain->native_mode;
domain->name);
fstrcpy(state->response.data.domain_info.alt_name,
domain->alt_name);
- fstrcpy(state->response.data.domain_info.sid,
- sid_string_static(&domain->sid));
+ sid_to_fstring(state->response.data.domain_info.sid, &domain->sid);
state->response.data.domain_info.native_mode =
domain->native_mode;
void winbindd_ping(struct winbindd_cli_state *state)
{
+ if (lp_parm_bool(-1, "winbindd", "ping_our_domain", False)) {
+ sendto_domain(state, find_our_domain());
+ return;
+ }
+
DEBUG(3, ("[%5lu]: ping\n", (unsigned long)state->pid));
request_ok(state);
}
+enum winbindd_result winbindd_dual_ping(struct winbindd_domain *domain,
+ struct winbindd_cli_state *state)
+{
+ DEBUG(3, ("[%5lu]: (dual) ping\n", (unsigned long)state->pid));
+ return WINBINDD_OK;
+}
+
/* List various tidbits of information */
void winbindd_info(struct winbindd_cli_state *state)