The branch, master has been updated via 1cb753a winbind: Simplify winbindd_dsgetdcname_recv from 3ec0645 vfs_catia: Simplify init_mappings()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 1cb753ae4e371df8555b82139d43a010b69bc3e8 Author: Volker Lendecke <v...@samba.org> Date: Fri Dec 12 23:00:41 2014 +0100 winbind: Simplify winbindd_dsgetdcname_recv Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Fri Feb 27 01:16:10 CET 2015 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/winbindd/winbindd_dsgetdcname.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/winbindd/winbindd_dsgetdcname.c b/source3/winbindd/winbindd_dsgetdcname.c index c447b3a..8eb1de7 100644 --- a/source3/winbindd/winbindd_dsgetdcname.c +++ b/source3/winbindd/winbindd_dsgetdcname.c @@ -101,6 +101,7 @@ NTSTATUS winbindd_dsgetdcname_recv(struct tevent_req *req, { struct winbindd_dsgetdcname_state *state = tevent_req_data( req, struct winbindd_dsgetdcname_state); + struct GUID_txt_buf guid_str_buf; char *guid_str; NTSTATUS status; @@ -109,10 +110,6 @@ NTSTATUS winbindd_dsgetdcname_recv(struct tevent_req *req, return status; } - guid_str = GUID_string(talloc_tos(), &state->dc_info->domain_guid); - if (guid_str == NULL) { - return NT_STATUS_NO_MEMORY; - } fstrcpy(response->data.dsgetdcname.dc_unc, state->dc_info->dc_unc); @@ -120,8 +117,11 @@ NTSTATUS winbindd_dsgetdcname_recv(struct tevent_req *req, state->dc_info->dc_address); response->data.dsgetdcname.dc_address_type = state->dc_info->dc_address_type; + + guid_str = GUID_buf_string(&state->dc_info->domain_guid, + &guid_str_buf); fstrcpy(response->data.dsgetdcname.domain_guid, guid_str); - TALLOC_FREE(guid_str); + fstrcpy(response->data.dsgetdcname.domain_name, state->dc_info->domain_name); fstrcpy(response->data.dsgetdcname.forest_name, -- Samba Shared Repository