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/utils | |
| 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/utils')
| -rw-r--r-- | source3/utils/net_rpc.c | 12 | ||||
| -rw-r--r-- | source3/utils/ntlm_auth.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 420bc1245e..561be2a41e 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -4212,7 +4212,7 @@ static BOOL get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *t } for (i = 0; i < response.data.num_entries; i++) { - gid_t gid = ((gid_t *)response.extra_data)[i]; + gid_t gid = ((gid_t *)response.extra_data.data)[i]; DOM_SID sid; struct winbindd_request sidrequest; @@ -4238,7 +4238,7 @@ static BOOL get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *t add_sid_to_token(token, &sid); } - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); return True; } @@ -4274,10 +4274,10 @@ static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens) /* Look through extra data */ - if (!response.extra_data) + if (!response.extra_data.data) return False; - extra_data = (const char *)response.extra_data; + extra_data = (const char *)response.extra_data.data; *num_tokens = 0; while(next_token(&extra_data, name, ",", sizeof(fstring))) { @@ -4291,7 +4291,7 @@ static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens) return False; } - extra_data = (const char *)response.extra_data; + extra_data = (const char *)response.extra_data.data; i=0; while(next_token(&extra_data, name, ",", sizeof(fstring))) { @@ -4319,7 +4319,7 @@ static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens) i+=1; } - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); *user_tokens = result; diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index f7e3263fe0..2e879cc113 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -380,7 +380,7 @@ NTSTATUS contact_winbind_auth_crap(const char *username, } if (flags & WBFLAG_PAM_UNIX_NAME) { - *unix_name = SMB_STRDUP((char *)response.extra_data); + *unix_name = SMB_STRDUP((char *)response.extra_data.data); if (!*unix_name) { free_response(&response); return NT_STATUS_NO_MEMORY; |