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/winbind_nss_irix.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/winbind_nss_irix.c')
| -rw-r--r-- | source3/nsswitch/winbind_nss_irix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/nsswitch/winbind_nss_irix.c b/source3/nsswitch/winbind_nss_irix.c index 73f3b4f33a..fd15f57940 100644 --- a/source3/nsswitch/winbind_nss_irix.c +++ b/source3/nsswitch/winbind_nss_irix.c @@ -216,8 +216,8 @@ winbind_callback(nsd_file_t **rqp, int fd) break; case WINBINDD_GETGRNAM: case WINBINDD_GETGRGID: - if (gr->num_gr_mem && response.extra_data) - members = response.extra_data; + if (gr->num_gr_mem && response.extra_data.data) + members = response.extra_data.data; else members = ""; snprintf(result,maxlen,"%s:%s:%d:%s\n", @@ -234,13 +234,13 @@ winbind_callback(nsd_file_t **rqp, int fd) "callback (winbind) - %d GETGRENT responses\n", response.data.num_entries); if (response.data.num_entries) { - gr = (struct winbindd_gr *)response.extra_data; + gr = (struct winbindd_gr *)response.extra_data.data; if (! gr ) { - nsd_logprintf(NSD_LOG_MIN, " no extra_data\n"); + nsd_logprintf(NSD_LOG_MIN, " no extra_data.data\n"); free_response(&response); return NSD_ERROR; } - members = (char *)response.extra_data + + members = (char *)response.extra_data.data + (response.data.num_entries * sizeof(struct winbindd_gr)); for (i = 0; i < response.data.num_entries; i++) { snprintf(result,maxlen,"%s:%s:%d:%s\n", @@ -262,7 +262,7 @@ winbind_callback(nsd_file_t **rqp, int fd) "callback (winbind) - %d GETPWENT responses\n", response.data.num_entries); if (response.data.num_entries) { - pw = (struct winbindd_pw *)response.extra_data; + pw = (struct winbindd_pw *)response.extra_data.data; if (! pw ) { nsd_logprintf(NSD_LOG_MIN, " no extra_data\n"); free_response(&response); |