diff options
author | Gerald Carter <jerry@samba.org> | 2006-04-12 14:10:39 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:16:00 -0500 |
commit | 8c9eb7631eecbe3f9bda30aff4b5d97d5e2a8737 (patch) | |
tree | cac69887b74af6bc9330a279919555fe52db53b7 /source3/nsswitch/winbindd_async.c | |
parent | 7a5ff0885d08f9e32dc9939e5fd676a987b881d9 (diff) | |
download | samba-8c9eb7631eecbe3f9bda30aff4b5d97d5e2a8737.tar.gz samba-8c9eb7631eecbe3f9bda30aff4b5d97d5e2a8737.tar.bz2 samba-8c9eb7631eecbe3f9bda30aff4b5d97d5e2a8737.zip |
r15053: fix portabilities issues between 32-bit winbind clients and a 64-bit winbindd server
(This used to be commit a95d11345e76948b147bbc1f29a05c978d99a47a)
Diffstat (limited to 'source3/nsswitch/winbindd_async.c')
-rw-r--r-- | source3/nsswitch/winbindd_async.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/nsswitch/winbindd_async.c b/source3/nsswitch/winbindd_async.c index 543dc88470..7f282df929 100644 --- a/source3/nsswitch/winbindd_async.c +++ b/source3/nsswitch/winbindd_async.c @@ -833,7 +833,7 @@ static void getsidaliases_recv(TALLOC_CTX *mem_ctx, BOOL success, return; } - aliases_str = response->extra_data; + aliases_str = response->extra_data.data; if (aliases_str == NULL) { DEBUG(10, ("getsidaliases return 0 SIDs\n")); @@ -847,7 +847,7 @@ static void getsidaliases_recv(TALLOC_CTX *mem_ctx, BOOL success, return; } - SAFE_FREE(response->extra_data); + SAFE_FREE(response->extra_data.data); cont(private_data, True, sids, num_sids); } @@ -878,7 +878,7 @@ void winbindd_getsidaliases_async(struct winbindd_domain *domain, ZERO_STRUCT(request); request.cmd = WINBINDD_DUAL_GETSIDALIASES; request.extra_len = len; - request.extra_data = sidstr; + request.extra_data.data = sidstr; do_async_domain(mem_ctx, domain, &request, getsidaliases_recv, cont, private_data); @@ -898,7 +898,7 @@ enum winbindd_result winbindd_dual_getsidaliases(struct winbindd_domain *domain, DEBUG(3, ("[%5lu]: getsidaliases\n", (unsigned long)state->pid)); - sidstr = state->request.extra_data; + sidstr = state->request.extra_data.data; if (sidstr == NULL) sidstr = talloc_strdup(state->mem_ctx, "\n"); /* No SID */ @@ -938,14 +938,14 @@ enum winbindd_result winbindd_dual_getsidaliases(struct winbindd_domain *domain, } if (!print_sidlist(NULL, sids, num_sids, - (char **)&state->response.extra_data, &len)) { + (char **)&state->response.extra_data.data, &len)) { DEBUG(0, ("Could not print_sidlist\n")); return WINBINDD_ERROR; } - if (state->response.extra_data != NULL) { + if (state->response.extra_data.data != NULL) { DEBUG(10, ("aliases_list: %s\n", - (char *)state->response.extra_data)); + (char *)state->response.extra_data.data)); state->response.length += len+1; } @@ -1026,7 +1026,7 @@ static void gettoken_recvdomgroups(TALLOC_CTX *mem_ctx, BOOL success, return; } - sids_str = response->extra_data; + sids_str = response->extra_data.data; if (sids_str == NULL) { /* This could be normal if we are dealing with a @@ -1052,7 +1052,7 @@ static void gettoken_recvdomgroups(TALLOC_CTX *mem_ctx, BOOL success, return; } - SAFE_FREE(response->extra_data); + SAFE_FREE(response->extra_data.data); if (state->alias_domain == NULL) { DEBUG(10, ("Don't expand domain local groups\n")); |