From ce9d89678111d95b6f94576dba934b10601e6e13 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 5 Sep 2008 23:22:10 +0200 Subject: Revert "winbindd: the ad trusted_domains call should return talloced strings." This reverts commit b57cbf62e8180c8fdb8f541c43358d36d8dbbdfa. (This used to be commit b2a3f13e5b3b81df2ed7460e54c11a7f56b3c4f6) --- source3/winbindd/winbindd_ads.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source3/winbindd/winbindd_ads.c') diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index c7f730e397..894e7866b3 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -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 { -- cgit