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_user.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_user.c')
| -rw-r--r-- | source3/nsswitch/winbindd_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c index 9b0796fb67..6179e497b7 100644 --- a/source3/nsswitch/winbindd_user.c +++ b/source3/nsswitch/winbindd_user.c @@ -632,15 +632,15 @@ void winbindd_getpwent(struct winbindd_cli_state *state) num_users = MIN(MAX_GETPWENT_USERS, state->request.data.num_entries); - if ((state->response.extra_data = SMB_MALLOC_ARRAY(struct winbindd_pw, num_users)) == NULL) { + if ((state->response.extra_data.data = SMB_MALLOC_ARRAY(struct winbindd_pw, num_users)) == NULL) { request_error(state); return; } - memset(state->response.extra_data, 0, num_users * + memset(state->response.extra_data.data, 0, num_users * sizeof(struct winbindd_pw)); - user_list = (struct winbindd_pw *)state->response.extra_data; + user_list = (struct winbindd_pw *)state->response.extra_data.data; if (!state->getpwent_initialized) winbindd_setpwent_internal(state); @@ -795,7 +795,7 @@ void winbindd_list_users(struct winbindd_cli_state *state) if (extra_data) { extra_data[extra_data_len - 1] = '\0'; - state->response.extra_data = extra_data; + state->response.extra_data.data = extra_data; state->response.length += extra_data_len; } |