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_pam.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_pam.c')
| -rw-r--r-- | source3/nsswitch/winbindd_pam.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index 44af66022e..6f07729493 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -97,13 +97,13 @@ static NTSTATUS append_info3_as_ndr(TALLOC_CTX *mem_ctx, } size = prs_data_size(&ps); - state->response.extra_data = SMB_MALLOC(size); - if (!state->response.extra_data) { + state->response.extra_data.data = SMB_MALLOC(size); + if (!state->response.extra_data.data) { prs_mem_free(&ps); return NT_STATUS_NO_MEMORY; } - memset( state->response.extra_data, '\0', size ); - prs_copy_all_data_out(state->response.extra_data, &ps); + memset( state->response.extra_data.data, '\0', size ); + prs_copy_all_data_out(state->response.extra_data.data, &ps); state->response.length += size; prs_mem_free(&ps); return NT_STATUS_OK; @@ -1311,12 +1311,12 @@ done: cell += 1; /* Append an AFS token string */ - state->response.extra_data = + state->response.extra_data.data = afs_createtoken_str(afsname, cell); - if (state->response.extra_data != NULL) + if (state->response.extra_data.data != NULL) state->response.length += - strlen(state->response.extra_data)+1; + strlen(state->response.extra_data.data)+1; no_token: TALLOC_FREE(afsname); @@ -1560,12 +1560,12 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain, DEBUG(5, ("Setting unix username to [%s]\n", username_out)); - state->response.extra_data = SMB_STRDUP(username_out); - if (!state->response.extra_data) { + state->response.extra_data.data = SMB_STRDUP(username_out); + if (!state->response.extra_data.data) { result = NT_STATUS_NO_MEMORY; goto done; } - state->response.length += strlen(state->response.extra_data)+1; + state->response.length += strlen(state->response.extra_data.data)+1; } if (state->request.flags & WBFLAG_PAM_USER_SESSION_KEY) { |