From 8c9eb7631eecbe3f9bda30aff4b5d97d5e2a8737 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 12 Apr 2006 14:10:39 +0000 Subject: r15053: fix portabilities issues between 32-bit winbind clients and a 64-bit winbindd server (This used to be commit a95d11345e76948b147bbc1f29a05c978d99a47a) --- source3/nsswitch/wbinfo.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'source3/nsswitch/wbinfo.c') diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 89ffa6b5b3..ad5ef71523 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -141,9 +141,9 @@ static BOOL wbinfo_get_usergroups(char *user) return False; for (i = 0; i < response.data.num_entries; i++) - d_printf("%d\n", (int)((gid_t *)response.extra_data)[i]); + d_printf("%d\n", (int)((gid_t *)response.extra_data.data)[i]); - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); return True; } @@ -169,13 +169,13 @@ static BOOL wbinfo_get_usersids(char *user_sid) if (result != NSS_STATUS_SUCCESS) return False; - s = response.extra_data; + s = response.extra_data.data; for (i = 0; i < response.data.num_entries; i++) { d_printf("%s\n", s); s += strlen(s) + 1; } - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); return True; } @@ -199,9 +199,9 @@ static BOOL wbinfo_get_userdomgroups(const char *user_sid) return False; if (response.data.num_entries != 0) - printf("%s", (char *)response.extra_data); + printf("%s", (char *)response.extra_data.data); - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); return True; } @@ -278,8 +278,8 @@ static BOOL wbinfo_list_domains(BOOL list_all_domains) /* Display response */ - if (response.extra_data) { - const char *extra_data = (char *)response.extra_data; + if (response.extra_data.data) { + const char *extra_data = (char *)response.extra_data.data; fstring name; char *p; @@ -294,7 +294,7 @@ static BOOL wbinfo_list_domains(BOOL list_all_domains) d_printf("%s\n", name); } - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); } return True; @@ -321,10 +321,10 @@ static BOOL wbinfo_show_sequence(const char *domain) /* Display response */ - if (response.extra_data) { - char *extra_data = (char *)response.extra_data; + if (response.extra_data.data) { + char *extra_data = (char *)response.extra_data.data; d_printf("%s", extra_data); - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); } return True; @@ -836,12 +836,12 @@ static BOOL wbinfo_klog(char *username) if (result != NSS_STATUS_SUCCESS) return False; - if (response.extra_data == NULL) { + if (response.extra_data.data == NULL) { d_fprintf(stderr, "Did not get token data\n"); return False; } - if (!afs_settoken_str((char *)response.extra_data)) { + if (!afs_settoken_str((char *)response.extra_data.data)) { d_fprintf(stderr, "Could not set token\n"); return False; } @@ -878,15 +878,15 @@ static BOOL print_domain_users(const char *domain) /* 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; while(next_token(&extra_data, name, ",", sizeof(fstring))) d_printf("%s\n", name); - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); return True; } @@ -916,15 +916,15 @@ static BOOL print_domain_groups(const char *domain) /* 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; while(next_token(&extra_data, name, ",", sizeof(fstring))) d_printf("%s\n", name); - SAFE_FREE(response.extra_data); + SAFE_FREE(response.extra_data.data); return True; } -- cgit