Copyright (C) Tim Potter 2000
Copyright (C) Andrew Bartlett 2002
-
+
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/>.
*/
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_WINBIND
-/* Check the machine account password is valid */
-
-void winbindd_check_machine_acct(struct winbindd_cli_state *state)
-{
- DEBUG(3, ("[%5lu]: check machine account\n",
- (unsigned long)state->pid));
-
- sendto_domain(state, find_our_domain());
-}
-
-enum winbindd_result winbindd_dual_check_machine_acct(struct winbindd_domain *domain,
- struct winbindd_cli_state *state)
-{
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- int num_retries = 0;
- struct winbindd_domain *contact_domain;
-
- DEBUG(3, ("[%5lu]: check machine account\n", (unsigned long)state->pid));
-
- /* Get trust account password */
-
- again:
-
- contact_domain = find_our_domain();
-
- /* This call does a cli_nt_setup_creds() which implicitly checks
- the trust account password. */
-
- invalidate_cm_connection(&contact_domain->conn);
-
- {
- struct rpc_pipe_client *netlogon_pipe;
- result = cm_connect_netlogon(contact_domain, &netlogon_pipe);
- }
-
- if (!NT_STATUS_IS_OK(result)) {
- DEBUG(3, ("could not open handle to NETLOGON pipe\n"));
- goto done;
- }
-
- /* There is a race condition between fetching the trust account
- password and the periodic machine password change. So it's
- possible that the trust account password has been changed on us.
- We are returned NT_STATUS_ACCESS_DENIED if this happens. */
-
-#define MAX_RETRIES 8
-
- if ((num_retries < MAX_RETRIES) &&
- NT_STATUS_V(result) == NT_STATUS_V(NT_STATUS_ACCESS_DENIED)) {
- num_retries++;
- goto again;
- }
-
- /* Pass back result code - zero for success, other values for
- specific failures. */
-
- DEBUG(3, ("secret is %s\n", NT_STATUS_IS_OK(result) ?
- "good" : "bad"));
-
- done:
- state->response.data.auth.nt_status = NT_STATUS_V(result);
- fstrcpy(state->response.data.auth.nt_status_string, nt_errstr(result));
- fstrcpy(state->response.data.auth.error_string, nt_errstr(result));
- state->response.data.auth.pam_error = nt_status_to_pam(result);
-
- DEBUG(NT_STATUS_IS_OK(result) ? 5 : 2, ("Checking the trust account password returned %s\n",
- state->response.data.auth.nt_status_string));
-
- return NT_STATUS_IS_OK(result) ? WINBINDD_OK : WINBINDD_ERROR;
-}
-
-/* Helpers for listing user and group names */
-
-const char *ent_type_strings[] = {"users",
- "groups"};
-
-static const char *get_ent_type_string(enum ent_type type)
-{
- return ent_type_strings[type];
-}
-
-struct listent_state {
- TALLOC_CTX *mem_ctx;
- struct winbindd_cli_state *cli_state;
- enum ent_type type;
- int domain_count;
- char *extra_data;
- uint32_t extra_data_len;
-};
-
-static void listent_recv(void *private_data, bool success, fstring dom_name,
- char *extra_data);
-
-/* List domain users/groups without mapping to unix ids */
-void winbindd_list_ent(struct winbindd_cli_state *state, enum ent_type type)
-{
- struct winbindd_domain *domain;
- const char *which_domain;
- struct listent_state *ent_state;
-
- DEBUG(3, ("[%5lu]: list %s\n", (unsigned long)state->pid,
- get_ent_type_string(type)));
-
- /* Ensure null termination */
- state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
- which_domain = state->request.domain_name;
-
- /* Initialize listent_state */
- ent_state = TALLOC_P(state->mem_ctx, struct listent_state);
- if (ent_state == NULL) {
- DEBUG(0, ("talloc failed\n"));
- request_error(state);
- return;
- }
-
- ent_state->mem_ctx = state->mem_ctx;
- ent_state->cli_state = state;
- ent_state->type = type;
- ent_state->domain_count = 0;
- ent_state->extra_data = NULL;
- ent_state->extra_data_len = 0;
-
- /* Must count the full list of expected domains before we request data
- * from any of them. Otherwise it's possible for a connection to the
- * first domain to fail, call listent_recv(), and return to the
- * client without checking any other domains. */
- for (domain = domain_list(); domain; domain = domain->next) {
- /* if we have a domain name restricting the request and this
- one in the list doesn't match, then just bypass the remainder
- of the loop */
- if ( *which_domain && !strequal(which_domain, domain->name) )
- continue;
-
- ent_state->domain_count++;
- }
-
- /* Make sure we're enumerating at least one domain */
- if (!ent_state->domain_count) {
- request_ok(state);
- return;
- }
-
- /* Enumerate list of trusted domains and request user/group list from
- * each */
- for (domain = domain_list(); domain; domain = domain->next) {
- if ( *which_domain && !strequal(which_domain, domain->name) )
- continue;
-
- winbindd_listent_async(state->mem_ctx, domain,
- listent_recv, ent_state, type);
- }
-}
-
-static void listent_recv(void *private_data, bool success, fstring dom_name,
- char *extra_data)
-{
- /* extra_data comes to us as a '\0' terminated string of comma
- separated users or groups */
- struct listent_state *state = talloc_get_type_abort(
- private_data, struct listent_state);
-
- /* Append users/groups from one domain onto the whole list */
- if (extra_data) {
- DEBUG(5, ("listent_recv: %s returned %s.\n",
- dom_name, get_ent_type_string(state->type)));
- if (!state->extra_data)
- state->extra_data = talloc_asprintf(state->mem_ctx,
- "%s", extra_data);
- else
- state->extra_data = talloc_asprintf_append(
- state->extra_data,
- ",%s", extra_data);
- /* Add one for the '\0' and each additional ',' */
- state->extra_data_len += strlen(extra_data) + 1;
- }
- else {
- DEBUG(5, ("listent_recv: %s returned no %s.\n",
- dom_name, get_ent_type_string(state->type)));
- }
-
- if (--state->domain_count)
- /* Still waiting for some child domains to return */
- return;
-
- /* Return list of all users/groups to the client */
- if (state->extra_data) {
- state->cli_state->response.extra_data.data =
- SMB_STRDUP(state->extra_data);
- state->cli_state->response.length += state->extra_data_len;
- }
-
- request_ok(state->cli_state);
-}
-
/* Constants and helper functions for determining domain trust types */
enum trust_type {
int extra_data_len = 0;
char *extra_data = NULL;
int i = 0;
-
+
DEBUG(3, ("[%5lu]: list trusted domains\n",
(unsigned long)state->pid));
goto done;
}
+ extra_data = talloc_strdup(state->mem_ctx, "");
+ if (extra_data == NULL) {
+ request_error(state);
+ goto done;
+ }
+
for ( i = 0; i < num_domains; i++ ) {
struct winbindd_domain *domain;
bool is_online = true;
if (domain) {
is_online = domain->online;
}
+ extra_data = talloc_asprintf_append_buffer(
+ extra_data,
+ "%s\\%s\\%s\\%s\\%s\\%s\\%s\\%s\n",
+ 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->data.num_entries = num_domains;
+
+ extra_data_len = strlen(extra_data);
+ if (extra_data_len > 0) {
- if ( !extra_data ) {
- 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\\%s\\%s\\%s\\%s\\%s",
- extra_data,
- 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" );
- }
- }
-
- extra_data_len = 0;
- if (extra_data != NULL) {
- extra_data_len = strlen(extra_data);
- }
+ /* Strip the last \n */
+ extra_data[extra_data_len-1] = '\0';
- if (extra_data_len > 0) {
- state->response.extra_data.data = SMB_STRDUP(extra_data);
- state->response.length += extra_data_len+1;
+ state->response->extra_data.data = extra_data;
+ state->response->length += extra_data_len;
}
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)
{
- uint32 i, num_domains;
- char **names, **alt_names;
- DOM_SID *sids;
+ int i;
int extra_data_len = 0;
char *extra_data;
NTSTATUS result;
bool have_own_domain = False;
+ struct netr_DomainTrustList trusts;
DEBUG(3, ("[%5lu]: list trusted domains\n",
(unsigned long)state->pid));
result = domain->methods->trusted_domains(domain, state->mem_ctx,
- &num_domains, &names,
- &alt_names, &sids);
+ &trusts);
if (!NT_STATUS_IS_OK(result)) {
DEBUG(3, ("winbindd_dual_list_trusted_domains: trusted_domains returned %s\n",
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_talloc(state->mem_ctx, &sids[0]));
-
- 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_talloc(state->mem_ctx, &sids[i]));
+ for (i=0; i<trusts.count; i++) {
+ extra_data = talloc_asprintf_append_buffer(
+ extra_data, "%s\\%s\\%s\n",
+ trusts.array[i].netbios_name,
+ trusts.array[i].dns_name,
+ sid_string_talloc(state->mem_ctx,
+ trusts.array[i].sid));
+ }
/* add our primary domain */
-
- for (i=0; i<num_domains; i++) {
- if (strequal(names[i], domain->name)) {
+
+ for (i=0; i<trusts.count; i++) {
+ if (strequal(trusts.array[i].netbios_name, domain->name)) {
have_own_domain = True;
break;
}
}
- 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,
+ if (state->request->data.list_all_domains && !have_own_domain) {
+ extra_data = talloc_asprintf_append_buffer(
+ extra_data, "%s\\%s\\%s\n", domain->name,
domain->alt_name ? domain->alt_name : domain->name,
sid_string_talloc(state->mem_ctx, &domain->sid));
}
- /* This is a bit excessive, but the extra data sooner or later will be
- talloc'ed */
-
- extra_data_len = 0;
- if (extra_data != NULL) {
- extra_data_len = strlen(extra_data);
- }
-
+ extra_data_len = strlen(extra_data);
if (extra_data_len > 0) {
- state->response.extra_data.data = SMB_STRDUP(extra_data);
- state->response.length += extra_data_len+1;
- }
-
- return WINBINDD_OK;
-}
-
-void winbindd_getdcname(struct winbindd_cli_state *state)
-{
- struct winbindd_domain *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));
-
- domain = find_domain_from_name_noinit(state->request.domain_name);
- if (domain && domain->internal) {
- fstrcpy(state->response.data.dc_name, global_myname());
- request_ok(state);
- return;
- }
-
- sendto_domain(state, find_our_domain());
-}
-enum winbindd_result winbindd_dual_getdcname(struct winbindd_domain *domain,
- struct winbindd_cli_state *state)
-{
- const char *dcname_slash = NULL;
- 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));
-
- 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;
- }
-
- /* This call can take a long time - allow the server to time out.
- 35 seconds should do it. */
-
- orig_timeout = rpccli_set_timeout(netlogon_pipe, 35000);
-
- req_domain = find_domain_from_name_noinit(state->request.domain_name);
- if (req_domain == domain) {
- result = rpccli_netr_GetDcName(netlogon_pipe,
- state->mem_ctx,
- domain->dcname,
- state->request.domain_name,
- &dcname_slash,
- &werr);
- } else {
- result = rpccli_netr_GetAnyDCName(netlogon_pipe,
- state->mem_ctx,
- domain->dcname,
- state->request.domain_name,
- &dcname_slash,
- &werr);
- }
- /* And restore our original timeout. */
- rpccli_set_timeout(netlogon_pipe, orig_timeout);
-
- if (!NT_STATUS_IS_OK(result)) {
- DEBUG(5,("Error requesting DCname for domain %s: %s\n",
- state->request.domain_name, nt_errstr(result)));
- return WINBINDD_ERROR;
- }
+ /* Strip the last \n */
+ extra_data[extra_data_len-1] = '\0';
- 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;
- }
-
- p = dcname_slash;
- if (*p == '\\') {
- p+=1;
- }
- if (*p == '\\') {
- p+=1;
+ state->response->extra_data.data = extra_data;
+ state->response->length += extra_data_len+1;
}
- fstrcpy(state->response.data.dc_name, p);
return WINBINDD_OK;
}
-struct sequence_state {
- TALLOC_CTX *mem_ctx;
- struct winbindd_cli_state *cli_state;
+struct domain_info_state {
struct winbindd_domain *domain;
- struct winbindd_request *request;
- struct winbindd_response *response;
- char *extra_data;
+ struct winbindd_cli_state *cli;
+ struct winbindd_request ping_request;
};
-static void sequence_recv(void *private_data, bool success);
+static void domain_info_done(struct tevent_req *req);
-void winbindd_show_sequence(struct winbindd_cli_state *state)
+void winbindd_domain_info(struct winbindd_cli_state *cli)
{
- struct sequence_state *seq;
-
- /* Ensure null termination */
- state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
+ struct domain_info_state *state;
+ struct winbindd_domain *domain;
+ struct tevent_req *req;
- if (strlen(state->request.domain_name) > 0) {
- struct winbindd_domain *domain;
- domain = find_domain_from_name_noinit(
- state->request.domain_name);
- if (domain == NULL) {
- request_error(state);
- return;
- }
- sendto_domain(state, domain);
- return;
- }
+ DEBUG(3, ("[%5lu]: domain_info [%s]\n", (unsigned long)cli->pid,
+ cli->request->domain_name));
- /* Ask all domains in sequence, collect the results in sequence_recv */
+ domain = find_domain_from_name_noinit(cli->request->domain_name);
- seq = TALLOC_P(state->mem_ctx, struct sequence_state);
- if (seq == NULL) {
- DEBUG(0, ("talloc failed\n"));
- request_error(state);
+ if (domain == NULL) {
+ DEBUG(3, ("Did not find domain [%s]\n",
+ cli->request->domain_name));
+ request_error(cli);
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);
+ if (domain->initialized) {
+ fstrcpy(cli->response->data.domain_info.name,
+ domain->name);
+ fstrcpy(cli->response->data.domain_info.alt_name,
+ domain->alt_name);
+ sid_to_fstring(cli->response->data.domain_info.sid,
+ &domain->sid);
+ cli->response->data.domain_info.native_mode =
+ domain->native_mode;
+ cli->response->data.domain_info.active_directory =
+ domain->active_directory;
+ cli->response->data.domain_info.primary =
+ domain->primary;
+ request_ok(cli);
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, "");
-
- if ((seq->request == NULL) || (seq->response == NULL) ||
- (seq->extra_data == NULL)) {
+
+ state = talloc_zero(cli->mem_ctx, struct domain_info_state);
+ if (state == NULL) {
DEBUG(0, ("talloc failed\n"));
- request_error(state);
+ request_error(cli);
return;
}
- seq->request->length = sizeof(*seq->request);
- seq->request->cmd = WINBINDD_SHOW_SEQUENCE;
- fstrcpy(seq->request->domain_name, seq->domain->name);
-
- async_domain_request(state->mem_ctx, seq->domain,
- seq->request, seq->response,
- sequence_recv, seq);
-}
-
-static void sequence_recv(void *private_data, bool success)
-{
- struct sequence_state *state =
- (struct sequence_state *)private_data;
- uint32 seq = DOM_SEQUENCE_NONE;
-
- if ((success) && (state->response->result == WINBINDD_OK))
- seq = state->response->data.sequence_number;
-
- if (seq == DOM_SEQUENCE_NONE) {
- state->extra_data = talloc_asprintf(state->mem_ctx,
- "%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,
- state->domain->name, seq);
- }
+ state->cli = cli;
+ state->domain = domain;
+ state->ping_request.cmd = WINBINDD_PING;
- state->domain->sequence_number = seq;
+ /*
+ * Send a ping down. This implicitly initializes the domain.
+ */
- state->domain = state->domain->next;
-
- if (state->domain == NULL) {
- struct winbindd_cli_state *cli_state = state->cli_state;
- cli_state->response.length =
- sizeof(cli_state->response) +
- strlen(state->extra_data) + 1;
- cli_state->response.extra_data.data =
- SMB_STRDUP(state->extra_data);
- request_ok(cli_state);
+ req = wb_domain_request_send(state, winbind_event_context(),
+ domain, &state->ping_request);
+ if (req == NULL) {
+ DEBUG(3, ("wb_domain_request_send failed\n"));
+ request_error(cli);
return;
}
-
- /* 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);
+ tevent_req_set_callback(req, domain_info_done, 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)
+static void domain_info_done(struct tevent_req *req)
{
- DEBUG(3, ("[%5lu]: show sequence\n", (unsigned long)state->pid));
+ struct domain_info_state *state = tevent_req_callback_data(
+ req, struct domain_info_state);
+ struct winbindd_response *response;
+ int ret, err;
- /* Ensure null termination */
- state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
+ ret = wb_domain_request_recv(req, req, &response, &err);
+ TALLOC_FREE(req);
+ if (ret == -1) {
+ DEBUG(10, ("wb_domain_request failed: %s\n", strerror(errno)));
+ request_error(state->cli);
+ return;
+ }
+ if (!state->domain->initialized) {
+ DEBUG(5, ("wb_domain_request did not initialize domain %s\n",
+ state->domain->name));
+ request_error(state->cli);
+ return;
+ }
- domain->methods->sequence_number(domain, &domain->sequence_number);
+ fstrcpy(state->cli->response->data.domain_info.name,
+ state->domain->name);
+ fstrcpy(state->cli->response->data.domain_info.alt_name,
+ state->domain->alt_name);
+ sid_to_fstring(state->cli->response->data.domain_info.sid,
+ &state->domain->sid);
- state->response.data.sequence_number =
- domain->sequence_number;
+ state->cli->response->data.domain_info.native_mode =
+ state->domain->native_mode;
+ state->cli->response->data.domain_info.active_directory =
+ state->domain->active_directory;
+ state->cli->response->data.domain_info.primary =
+ state->domain->primary;
- return WINBINDD_OK;
+ request_ok(state->cli);
}
-struct domain_info_state {
- struct winbindd_domain *domain;
- struct winbindd_cli_state *cli_state;
-};
-
-static void domain_info_init_recv(void *private_data, bool success);
-
-void winbindd_domain_info(struct winbindd_cli_state *state)
+void winbindd_dc_info(struct winbindd_cli_state *cli)
{
struct winbindd_domain *domain;
+ char *dc_name, *dc_ip;
- DEBUG(3, ("[%5lu]: domain_info [%s]\n", (unsigned long)state->pid,
- state->request.domain_name));
+ cli->request->domain_name[sizeof(cli->request->domain_name)-1] = '\0';
- domain = find_domain_from_name_noinit(state->request.domain_name);
+ DEBUG(3, ("[%5lu]: domain_info [%s]\n", (unsigned long)cli->pid,
+ cli->request->domain_name));
- if (domain == NULL) {
- DEBUG(3, ("Did not find domain [%s]\n",
- state->request.domain_name));
- request_error(state);
- return;
- }
-
- if (!domain->initialized) {
- struct domain_info_state *istate;
-
- istate = TALLOC_P(state->mem_ctx, struct domain_info_state);
- if (istate == NULL) {
- DEBUG(0, ("talloc failed\n"));
- request_error(state);
+ if (cli->request->domain_name[0] != '\0') {
+ domain = find_domain_from_name_noinit(
+ cli->request->domain_name);
+ DEBUG(10, ("Could not find domain %s\n",
+ cli->request->domain_name));
+ if (domain == NULL) {
+ request_error(cli);
return;
}
+ } else {
+ domain = find_our_domain();
+ }
- istate->cli_state = state;
- istate->domain = domain;
-
- init_child_connection(domain, domain_info_init_recv, istate);
-
+ if (!fetch_current_dc_from_gencache(
+ talloc_tos(), domain->name, &dc_name, &dc_ip)) {
+ DEBUG(10, ("fetch_current_dc_from_gencache(%s) failed\n",
+ domain->name));
+ request_error(cli);
return;
}
- fstrcpy(state->response.data.domain_info.name,
- domain->name);
- fstrcpy(state->response.data.domain_info.alt_name,
- domain->alt_name);
- sid_to_fstring(state->response.data.domain_info.sid, &domain->sid);
-
- state->response.data.domain_info.native_mode =
- domain->native_mode;
- state->response.data.domain_info.active_directory =
- domain->active_directory;
- state->response.data.domain_info.primary =
- domain->primary;
-
- request_ok(state);
-}
-
-static void domain_info_init_recv(void *private_data, bool success)
-{
- struct domain_info_state *istate =
- (struct domain_info_state *)private_data;
- struct winbindd_cli_state *state = istate->cli_state;
- struct winbindd_domain *domain = istate->domain;
+ cli->response->data.num_entries = 1;
+ cli->response->extra_data.data = talloc_asprintf(
+ cli->mem_ctx, "%s\n%s\n", dc_name, dc_ip);
- DEBUG(10, ("Got back from child init: %d\n", success));
+ TALLOC_FREE(dc_name);
+ TALLOC_FREE(dc_ip);
- if ((!success) || (!domain->initialized)) {
- DEBUG(5, ("Could not init child for domain %s\n",
- domain->name));
- request_error(state);
+ if (cli->response->extra_data.data == NULL) {
+ request_error(cli);
return;
}
- fstrcpy(state->response.data.domain_info.name,
- domain->name);
- fstrcpy(state->response.data.domain_info.alt_name,
- domain->alt_name);
- sid_to_fstring(state->response.data.domain_info.sid, &domain->sid);
-
- state->response.data.domain_info.native_mode =
- domain->native_mode;
- state->response.data.domain_info.active_directory =
- domain->active_directory;
- state->response.data.domain_info.primary =
- domain->primary;
-
- request_ok(state);
-}
+ /* must add one to length to copy the 0 for string termination */
+ cli->response->length +=
+ strlen((char *)cli->response->extra_data.data) + 1;
-void winbindd_ping(struct winbindd_cli_state *state)
-{
- DEBUG(3, ("[%5lu]: ping\n", (unsigned long)state->pid));
- request_ok(state);
+ request_ok(cli);
}
/* List various tidbits of information */
DEBUG(3, ("[%5lu]: request misc info\n", (unsigned long)state->pid));
- state->response.data.info.winbind_separator = *lp_winbind_separator();
- fstrcpy(state->response.data.info.samba_version, SAMBA_VERSION_STRING);
+ state->response->data.info.winbind_separator = *lp_winbind_separator();
+ fstrcpy(state->response->data.info.samba_version, samba_version_string());
request_ok(state);
}
{
DEBUG(3, ("[%5lu]: request interface version\n",
(unsigned long)state->pid));
-
- state->response.data.interface_version = WINBIND_INTERFACE_VERSION;
+
+ state->response->data.interface_version = WINBIND_INTERFACE_VERSION;
request_ok(state);
}
void winbindd_domain_name(struct winbindd_cli_state *state)
{
DEBUG(3, ("[%5lu]: request domain name\n", (unsigned long)state->pid));
-
- fstrcpy(state->response.data.domain_name, lp_workgroup());
+
+ fstrcpy(state->response->data.domain_name, lp_workgroup());
request_ok(state);
}
{
DEBUG(3, ("[%5lu]: request netbios name\n",
(unsigned long)state->pid));
-
- fstrcpy(state->response.data.netbios_name, global_myname());
+
+ fstrcpy(state->response->data.netbios_name, global_myname());
request_ok(state);
}
-/* Where can I find the privilaged pipe? */
+/* Where can I find the privileged pipe? */
void winbindd_priv_pipe_dir(struct winbindd_cli_state *state)
{
-
+ char *priv_dir;
DEBUG(3, ("[%5lu]: request location of privileged pipe\n",
(unsigned long)state->pid));
-
- state->response.extra_data.data = SMB_STRDUP(get_winbind_priv_pipe_dir());
- if (!state->response.extra_data.data) {
- DEBUG(0, ("malloc failed\n"));
- request_error(state);
- return;
- }
+
+ priv_dir = get_winbind_priv_pipe_dir();
+ state->response->extra_data.data = talloc_move(state->mem_ctx,
+ &priv_dir);
/* must add one to length to copy the 0 for string termination */
- state->response.length +=
- strlen((char *)state->response.extra_data.data) + 1;
+ state->response->length +=
+ strlen((char *)state->response->extra_data.data) + 1;
request_ok(state);
}
git.samba.org / samba.git / blobdiff