The branch, v3-devel has been updated
via b2a3f13e5b3b81df2ed7460e54c11a7f56b3c4f6 (commit)
from be6f12273f171a3eb1967d2299064e57d737f6a4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -----------------------------------------------------------------
commit b2a3f13e5b3b81df2ed7460e54c11a7f56b3c4f6
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Sep 5 23:22:10 2008 +0200
Revert "winbindd: the ad trusted_domains call should return talloced
strings."
This reverts commit b57cbf62e8180c8fdb8f541c43358d36d8dbbdfa.
-----------------------------------------------------------------------
Summary of changes:
source/winbindd/winbindd_ads.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_ads.c b/source/winbindd/winbindd_ads.c
index c7f730e..894e786 100644
--- a/source/winbindd/winbindd_ads.c
+++ b/source/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 {
--
Samba Shared Repository
