mirror of
https://github.com/samba-team/samba.git
synced 2025-01-26 10:04:02 +03:00
Revert "winbindd: the ad trusted_domains call should return talloced strings."
This reverts commit b57cbf62e8180c8fdb8f541c43358d36d8dbbdfa. (This used to be commit b2a3f13e5b3b81df2ed7460e54c11a7f56b3c4f6)
This commit is contained in:
parent
38c287740f
commit
ce9d896781
@ -1241,11 +1241,8 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
|
||||
continue;
|
||||
}
|
||||
|
||||
(*names)[ret_count] = talloc_strdup(mem_ctx, trusts.array[i].netbios_name);
|
||||
(*alt_names)[ret_count] = talloc_strdup(mem_ctx, trusts.array[i].dns_name);
|
||||
if ((*names)[ret_count] == NULL) {
|
||||
return NT_STATUS_NO_MEMORY;
|
||||
}
|
||||
(*names)[ret_count] = CONST_DISCARD(char *, trusts.array[i].netbios_name);
|
||||
(*alt_names)[ret_count] = CONST_DISCARD(char *, trusts.array[i].dns_name);
|
||||
if (trusts.array[i].sid) {
|
||||
sid_copy(&(*dom_sids)[ret_count], trusts.array[i].sid);
|
||||
} else {
|
||||
|
Loading…
x
Reference in New Issue
Block a user