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_misc.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_misc.c')
| -rw-r--r-- | source3/nsswitch/winbindd_misc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c index b6aecae393..9413a79aba 100644 --- a/source3/nsswitch/winbindd_misc.c +++ b/source3/nsswitch/winbindd_misc.c @@ -161,7 +161,7 @@ enum winbindd_result winbindd_dual_list_trusted_domains(struct winbindd_domain * extra_data_len = strlen(extra_data); if (extra_data_len > 0) { - state->response.extra_data = SMB_STRDUP(extra_data); + state->response.extra_data.data = SMB_STRDUP(extra_data); state->response.length += extra_data_len+1; } @@ -319,7 +319,7 @@ static void sequence_recv(void *private_data, BOOL success) cli_state->response.length = sizeof(cli_state->response) + strlen(state->extra_data) + 1; - cli_state->response.extra_data = + cli_state->response.extra_data.data = SMB_STRDUP(state->extra_data); request_ok(cli_state); return; @@ -503,8 +503,8 @@ void winbindd_priv_pipe_dir(struct winbindd_cli_state *state) DEBUG(3, ("[%5lu]: request location of privileged pipe\n", (unsigned long)state->pid)); - state->response.extra_data = SMB_STRDUP(get_winbind_priv_pipe_dir()); - if (!state->response.extra_data) { + state->response.extra_data.data = SMB_STRDUP(get_winbind_priv_pipe_dir()); + if (!state->response.extra_data.data) { DEBUG(0, ("malloc failed\n")); request_error(state); return; @@ -512,7 +512,7 @@ void winbindd_priv_pipe_dir(struct winbindd_cli_state *state) /* must add one to length to copy the 0 for string termination */ state->response.length += - strlen((char *)state->response.extra_data) + 1; + strlen((char *)state->response.extra_data.data) + 1; request_ok(state); } |