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_nss.h | |
| 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_nss.h')
| -rw-r--r-- | source3/nsswitch/winbindd_nss.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/source3/nsswitch/winbindd_nss.h b/source3/nsswitch/winbindd_nss.h index c5ca507bda..5d0b1efaed 100644 --- a/source3/nsswitch/winbindd_nss.h +++ b/source3/nsswitch/winbindd_nss.h @@ -155,8 +155,8 @@ typedef struct winbindd_gr { fstring gr_name; fstring gr_passwd; gid_t gr_gid; - size_t num_gr_mem; - size_t gr_mem_ofs; /* offset to group membership */ + uint32 num_gr_mem; + uint32 gr_mem_ofs; /* offset to group membership */ char **gr_mem; } WINBINDD_GR; @@ -257,8 +257,13 @@ struct winbindd_request { } dual_idmapset; BOOL list_all_domains; } data; - char *extra_data; - size_t extra_len; + union { +#if defined(uint64) + uint64 z; +#endif + char *data; + } extra_data; + uint32 extra_len; char null_term; }; @@ -376,7 +381,12 @@ struct winbindd_response { /* Variable length return data */ - void *extra_data; /* getgrnam, getgrgid, getgrent */ + union { +#if defined(uint64) + uint64 z; +#endif + void *data; + } extra_data; }; struct WINBINDD_CCACHE_ENTRY { |