sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

winbindd: return trust parameters when listing trusts

Browse Source 
When asking a child domain process to list trusts on that domain,
return (along with trust domain names and SID) the trust properties -
flags, type, and attributes.

Use those attributes to initialize domain object.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11691

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Tue Feb 23 22:02:16 CET 2016 on sn-devel-144
This commit is contained in:
Uri Simchoni 2016-02-10 00:38:11 +02:00 committed by Ralph Boehme
parent d0aa5d0574
commit 7b4dfd939f
2 changed files with 61 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/winbindd/winbindd_misc.c
View File

@ -181,11 +181,12 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain *
} }
extra_data = talloc_asprintf_append_buffer( extra_data = talloc_asprintf_append_buffer(
extra_data, "%s\\%s\\%s\n", extra_data, "%s\\%s\\%s\\%u\\%u\\%u\n",
trusts.array[i].netbios_name, trusts.array[i].netbios_name, trusts.array[i].dns_name,
trusts.array[i].dns_name, sid_string_talloc(state->mem_ctx, trusts.array[i].sid),
sid_string_talloc(state->mem_ctx, trusts.array[i].trust_flags,
trusts.array[i].sid)); (uint32_t)trusts.array[i].trust_type,
trusts.array[i].trust_attributes);
} }
/* add our primary domain */ /* add our primary domain */

74
source3/winbindd/winbindd_util.c
View File

@ -343,24 +343,37 @@ static void trustdom_list_done(struct tevent_req *req)
struct winbindd_response *response; struct winbindd_response *response;
int res, err; int res, err;
char *p; char *p;
struct winbindd_tdc_domain trust_params = {0};
ptrdiff_t extra_len;
res = wb_domain_request_recv(req, state, &response, &err); res = wb_domain_request_recv(req, state, &response, &err);
if ((res == -1) || (response->result != WINBINDD_OK)) { if ((res == -1) || (response->result != WINBINDD_OK)) {
DEBUG(1, ("Could not receive trustdoms\n")); DBG_WARNING("Could not receive trustdoms\n");
TALLOC_FREE(state); TALLOC_FREE(state);
return; return;
} }
if (response->length < sizeof(struct winbindd_response)) {
DBG_ERR("ill-formed trustdom response - short length\n");
TALLOC_FREE(state);
return;
}
extra_len = response->length - sizeof(struct winbindd_response);
p = (char *)response->extra_data.data; p = (char *)response->extra_data.data;
while ((p != NULL) && (*p != '\0')) { while ((p - (char *)response->extra_data.data) < extra_len) {
char *q, *sidstr, *alt_name; char *q, *sidstr, *alt_name;
struct dom_sid sid;
char *alternate_name = NULL; DBG_DEBUG("parsing response line '%s'\n", p);
ZERO_STRUCT(trust_params);
trust_params.domain_name = p;
alt_name = strchr(p, '\\'); alt_name = strchr(p, '\\');
if (alt_name == NULL) { if (alt_name == NULL) {
DEBUG(0, ("Got invalid trustdom response\n")); DBG_ERR("Got invalid trustdom response\n");
break; break;
} }
@ -369,26 +382,52 @@ static void trustdom_list_done(struct tevent_req *req)
sidstr = strchr(alt_name, '\\'); sidstr = strchr(alt_name, '\\');
if (sidstr == NULL) { if (sidstr == NULL) {
DEBUG(0, ("Got invalid trustdom response\n")); DBG_ERR("Got invalid trustdom response\n");
break; break;
} }
*sidstr = '\0'; *sidstr = '\0';
sidstr += 1; sidstr += 1;
q = strchr(sidstr, '\n'); /* use the real alt_name if we have one, else pass in NULL */
if (q != NULL) if (!strequal(alt_name, "(null)")) {
*q = '\0'; trust_params.dns_name = alt_name;
}
if (!string_to_sid(&sid, sidstr)) { q = strtok(sidstr, "\\");
if (q == NULL) {
DBG_ERR("Got invalid trustdom response\n");
break;
}
if (!string_to_sid(&trust_params.sid, sidstr)) {
DEBUG(0, ("Got invalid trustdom response\n")); DEBUG(0, ("Got invalid trustdom response\n"));
break; break;
} }
/* use the real alt_name if we have one, else pass in NULL */ q = strtok(NULL, "\\");
if (q == NULL) {
DBG_ERR("Got invalid trustdom response\n");
break;
}
if ( !strequal( alt_name, "(null)" ) ) trust_params.trust_flags = (uint32_t)strtoul(q, NULL, 10);
alternate_name = alt_name;
q = strtok(NULL, "\\");
if (q == NULL) {
DBG_ERR("Got invalid trustdom response\n");
break;
}
trust_params.trust_type = (uint32_t)strtoul(q, NULL, 10);
q = strtok(NULL, "\n");
if (q == NULL) {
DBG_ERR("Got invalid trustdom response\n");
break;
}
trust_params.trust_attribs = (uint32_t)strtoul(q, NULL, 10);
/* /*
* We always call add_trusted_domain() cause on an existing * We always call add_trusted_domain() cause on an existing
@ -396,13 +435,10 @@ static void trustdom_list_done(struct tevent_req *req)
* This is important because we need the SID for sibling * This is important because we need the SID for sibling
* domains. * domains.
*/ */
(void)add_trusted_domain(p, alternate_name, (void)add_trusted_domain_from_tdc(&trust_params,
&cache_methods, &cache_methods);
&sid);
p=q; p = q + strlen(q) + 1;
if (p != NULL)
p += 1;
} }
/* /*