r15053: fix portabilities issues between 32-bit winbind clients and a 64-bit winbindd...

[jra/samba/.git] / source3 / nsswitch / winbindd_async.c

diff --git a/source3/nsswitch/winbindd_async.c b/source3/nsswitch/winbindd_async.c
index 543dc884709583d240b7d0c985b7acb5493c5afc..7f282df929d50749290048a1f1d744aaf273b97b 100644 (file)
--- a/source3/nsswitch/winbindd_async.c
+++ b/source3/nsswitch/winbindd_async.c
@@ -833,7 +833,7 @@ static void getsidaliases_recv(TALLOC_CTX *mem_ctx, BOOL success,
                return;
        }
 
-       aliases_str = response->extra_data;
+       aliases_str = response->extra_data.data;
 
        if (aliases_str == NULL) {
                DEBUG(10, ("getsidaliases return 0 SIDs\n"));
@@ -847,7 +847,7 @@ static void getsidaliases_recv(TALLOC_CTX *mem_ctx, BOOL success,
                return;
        }
 
-       SAFE_FREE(response->extra_data);
+       SAFE_FREE(response->extra_data.data);
 
        cont(private_data, True, sids, num_sids);
 }
@@ -878,7 +878,7 @@ void winbindd_getsidaliases_async(struct winbindd_domain *domain,
        ZERO_STRUCT(request);
        request.cmd = WINBINDD_DUAL_GETSIDALIASES;
        request.extra_len = len;
-       request.extra_data = sidstr;
+       request.extra_data.data = sidstr;
 
        do_async_domain(mem_ctx, domain, &request, getsidaliases_recv,
                        cont, private_data);
@@ -898,7 +898,7 @@ enum winbindd_result winbindd_dual_getsidaliases(struct winbindd_domain *domain,
 
        DEBUG(3, ("[%5lu]: getsidaliases\n", (unsigned long)state->pid));
 
-       sidstr = state->request.extra_data;
+       sidstr = state->request.extra_data.data;
        if (sidstr == NULL)
                sidstr = talloc_strdup(state->mem_ctx, "\n"); /* No SID */
 
@@ -938,14 +938,14 @@ enum winbindd_result winbindd_dual_getsidaliases(struct winbindd_domain *domain,
        }
 
        if (!print_sidlist(NULL, sids, num_sids,
-                          (char **)&state->response.extra_data, &len)) {
+                          (char **)&state->response.extra_data.data, &len)) {
                DEBUG(0, ("Could not print_sidlist\n"));
                return WINBINDD_ERROR;
        }
 
-       if (state->response.extra_data != NULL) {
+       if (state->response.extra_data.data != NULL) {
                DEBUG(10, ("aliases_list: %s\n",
-                          (char *)state->response.extra_data));
+                          (char *)state->response.extra_data.data));
                state->response.length += len+1;
        }
        
@@ -1026,7 +1026,7 @@ static void gettoken_recvdomgroups(TALLOC_CTX *mem_ctx, BOOL success,
                return;
        }
 
-       sids_str = response->extra_data;
+       sids_str = response->extra_data.data;
 
        if (sids_str == NULL) {
                /* This could be normal if we are dealing with a
@@ -1052,7 +1052,7 @@ static void gettoken_recvdomgroups(TALLOC_CTX *mem_ctx, BOOL success,
                return;
        }
 
-       SAFE_FREE(response->extra_data);
+       SAFE_FREE(response->extra_data.data);
 
        if (state->alias_domain == NULL) {
                DEBUG(10, ("Don't expand domain local groups\n"));