svn commit: samba r20355 - in branches/SAMBA_3_0/source/nsswitch: .

vlendec at samba.org vlendec at samba.org
Wed Dec 27 10:26:32 GMT 2006


Author: vlendec
Date: 2006-12-27 10:26:32 +0000 (Wed, 27 Dec 2006)
New Revision: 20355

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20355

Log:
Fix some C++ warnings
Modified:
   branches/SAMBA_3_0/source/nsswitch/wb_client.c
   branches/SAMBA_3_0/source/nsswitch/winbindd_async.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/wb_client.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wb_client.c	2006-12-27 03:23:25 UTC (rev 20354)
+++ branches/SAMBA_3_0/source/nsswitch/wb_client.c	2006-12-27 10:26:32 UTC (rev 20355)
@@ -374,7 +374,7 @@
 
 	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);
 	}

Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_async.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_async.c	2006-12-27 03:23:25 UTC (rev 20354)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_async.c	2006-12-27 10:26:32 UTC (rev 20355)
@@ -256,7 +256,7 @@
 	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 @@
 	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);



More information about the samba-cvs mailing list