diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-12-27 10:26:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:43 -0500 |
| commit | 9f2807fc93bf25bbc06ddedebd0a1d17993444ec (patch) | |
| tree | 01d4df290e0e69ba8067fe63cdd727df8e993f34 /source3/nsswitch | |
| parent | 96a2972bd267b4e60242127b43f5466471c3d720 (diff) | |
| download | samba-9f2807fc93bf25bbc06ddedebd0a1d17993444ec.tar.gz samba-9f2807fc93bf25bbc06ddedebd0a1d17993444ec.tar.bz2 samba-9f2807fc93bf25bbc06ddedebd0a1d17993444ec.zip | |
r20355: Fix some C++ warnings
(This used to be commit f103c301b18f2eeb5203634cb6b50fa79f57a93b)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/wb_client.c | 2 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_async.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/nsswitch/wb_client.c b/source3/nsswitch/wb_client.c index 87eab6438c..53179de8f1 100644 --- a/source3/nsswitch/wb_client.c +++ b/source3/nsswitch/wb_client.c @@ -374,7 +374,7 @@ BOOL winbind_sids_to_unixids(struct id_map *ids, int num_ids) request.extra_len = num_ids * sizeof(DOM_SID); - sids = SMB_MALLOC(request.extra_len); + sids = (DOM_SID *)SMB_MALLOC(request.extra_len); for (i = 0; i < num_ids; i++) { sid_copy(&sids[i], ids[i].sid); } diff --git a/source3/nsswitch/winbindd_async.c b/source3/nsswitch/winbindd_async.c index 721979e2bc..913cfdecc5 100644 --- a/source3/nsswitch/winbindd_async.c +++ b/source3/nsswitch/winbindd_async.c @@ -256,7 +256,7 @@ void winbindd_sids2xids_async(TALLOC_CTX *mem_ctx, void *sids, int size, struct winbindd_request request; ZERO_STRUCT(request); request.cmd = WINBINDD_DUAL_SIDS2XIDS; - request.extra_data.data = sids; + request.extra_data.data = (char *)sids; request.extra_len = size; do_async(mem_ctx, idmap_child(), &request, winbindd_sids2xids_recv, (void *)cont, private_data); @@ -1516,7 +1516,7 @@ void winbindd_dump_maps_async(TALLOC_CTX *mem_ctx, void *data, int size, struct winbindd_request request; ZERO_STRUCT(request); request.cmd = WINBINDD_DUAL_DUMP_MAPS; - request.extra_data.data = data; + request.extra_data.data = (char *)data; request.extra_len = size; do_async(mem_ctx, idmap_child(), &request, winbindd_dump_id_maps_recv, (void *)cont, private_data); |