svn commit: samba r18667 - in branches/SAMBA_3_0/source: librpc/ndr nsswitch

[vlendec at samba.org]

Author: vlendec
Date: 2006-09-19 01:28:25 +0000 (Tue, 19 Sep 2006)
New Revision: 18667

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

Log:
Two C++ warnings
Modified:
   branches/SAMBA_3_0/source/librpc/ndr/sid.c
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c


Changeset:
Modified: branches/SAMBA_3_0/source/librpc/ndr/sid.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/ndr/sid.c	2006-09-19 01:27:20 UTC (rev 18666)
+++ branches/SAMBA_3_0/source/librpc/ndr/sid.c	2006-09-19 01:28:25 UTC (rev 18667)
@@ -73,7 +73,7 @@
 	}
 
 	maxlen = sid->num_auths * 11 + 25;
-	ret = talloc_size(mem_ctx, maxlen);
+	ret = (char *)talloc_size(mem_ctx, maxlen);
 	if (!ret) return talloc_strdup(mem_ctx, "(SID ERR)");
 
 	ia = (sid->id_auth[5]) +

Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-09-19 01:27:20 UTC (rev 18666)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-09-19 01:28:25 UTC (rev 18667)
@@ -575,7 +575,7 @@
 	/* If winbindd returned a username, return the pointer to it here. */
 	if (user_ret && response.extra_data.data) {
 		/* We have to trust it's a null terminated string. */
-		*user_ret = response.extra_data.data;
+		*user_ret = (char *)response.extra_data.data;
 	}
 
 	return ret;