svn commit: samba r23953 - in branches: SAMBA_3_2/source/libads SAMBA_3_2_0/source/libads

[vlendec at samba.org]

Author: vlendec
Date: 2007-07-18 12:28:32 +0000 (Wed, 18 Jul 2007)
New Revision: 23953

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

Log:
Some C++ warnings
Modified:
   branches/SAMBA_3_2/source/libads/sasl.c
   branches/SAMBA_3_2/source/libads/sasl_wrapping.c
   branches/SAMBA_3_2_0/source/libads/sasl.c
   branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c


Changeset:
Modified: branches/SAMBA_3_2/source/libads/sasl.c
===================================================================
--- branches/SAMBA_3_2/source/libads/sasl.c	2007-07-18 11:43:50 UTC (rev 23952)
+++ branches/SAMBA_3_2/source/libads/sasl.c	2007-07-18 12:28:32 UTC (rev 23953)
@@ -23,7 +23,8 @@
 
 static ADS_STATUS ads_sasl_ntlmssp_wrap(ADS_STRUCT *ads, uint8 *buf, uint32 len)
 {
-	struct ntlmssp_state *ntlmssp_state = ads->ldap.wrap_private_data;
+	struct ntlmssp_state *ntlmssp_state =
+		(struct ntlmssp_state *)ads->ldap.wrap_private_data;
 	ADS_STATUS status;
 	NTSTATUS nt_status;
 	DATA_BLOB sig;
@@ -61,7 +62,8 @@
 
 static ADS_STATUS ads_sasl_ntlmssp_unwrap(ADS_STRUCT *ads)
 {
-	struct ntlmssp_state *ntlmssp_state = ads->ldap.wrap_private_data;
+	struct ntlmssp_state *ntlmssp_state =
+		(struct ntlmssp_state *)ads->ldap.wrap_private_data;
 	ADS_STATUS status;
 	NTSTATUS nt_status;
 	DATA_BLOB sig;
@@ -95,7 +97,8 @@
 
 static void ads_sasl_ntlmssp_disconnect(ADS_STRUCT *ads)
 {
-	struct ntlmssp_state *ntlmssp_state = ads->ldap.wrap_private_data;
+	struct ntlmssp_state *ntlmssp_state =
+		(struct ntlmssp_state *)ads->ldap.wrap_private_data;
 
 	ntlmssp_end(&ntlmssp_state);
 

Modified: branches/SAMBA_3_2/source/libads/sasl_wrapping.c
===================================================================
--- branches/SAMBA_3_2/source/libads/sasl_wrapping.c	2007-07-18 11:43:50 UTC (rev 23952)
+++ branches/SAMBA_3_2/source/libads/sasl_wrapping.c	2007-07-18 12:28:32 UTC (rev 23953)
@@ -213,7 +213,7 @@
 		ret = ads_saslwrap_prepare_outbuf(ads, rlen);
 		if (ret < 0) return ret;
 		
-		status = ads->ldap.wrap_ops->wrap(ads, buf, rlen);
+		status = ads->ldap.wrap_ops->wrap(ads, (uint8 *)buf, rlen);
 		if (!ADS_ERR_OK(status)) {
 			errno = EACCES;
 			return -1;

Modified: branches/SAMBA_3_2_0/source/libads/sasl.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/sasl.c	2007-07-18 11:43:50 UTC (rev 23952)
+++ branches/SAMBA_3_2_0/source/libads/sasl.c	2007-07-18 12:28:32 UTC (rev 23953)
@@ -23,7 +23,8 @@
 
 static ADS_STATUS ads_sasl_ntlmssp_wrap(ADS_STRUCT *ads, uint8 *buf, uint32 len)
 {
-	struct ntlmssp_state *ntlmssp_state = ads->ldap.wrap_private_data;
+	struct ntlmssp_state *ntlmssp_state =
+		(struct ntlmssp_state *)ads->ldap.wrap_private_data;
 	ADS_STATUS status;
 	NTSTATUS nt_status;
 	DATA_BLOB sig;
@@ -61,7 +62,8 @@
 
 static ADS_STATUS ads_sasl_ntlmssp_unwrap(ADS_STRUCT *ads)
 {
-	struct ntlmssp_state *ntlmssp_state = ads->ldap.wrap_private_data;
+	struct ntlmssp_state *ntlmssp_state =
+		(struct ntlmssp_state *)ads->ldap.wrap_private_data;
 	ADS_STATUS status;
 	NTSTATUS nt_status;
 	DATA_BLOB sig;
@@ -95,7 +97,8 @@
 
 static void ads_sasl_ntlmssp_disconnect(ADS_STRUCT *ads)
 {
-	struct ntlmssp_state *ntlmssp_state = ads->ldap.wrap_private_data;
+	struct ntlmssp_state *ntlmssp_state =
+		(struct ntlmssp_state *)ads->ldap.wrap_private_data;
 
 	ntlmssp_end(&ntlmssp_state);
 

Modified: branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c
===================================================================
--- branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c	2007-07-18 11:43:50 UTC (rev 23952)
+++ branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c	2007-07-18 12:28:32 UTC (rev 23953)
@@ -213,7 +213,7 @@
 		ret = ads_saslwrap_prepare_outbuf(ads, rlen);
 		if (ret < 0) return ret;
 		
-		status = ads->ldap.wrap_ops->wrap(ads, buf, rlen);
+		status = ads->ldap.wrap_ops->wrap(ads, (uint8 *)buf, rlen);
 		if (!ADS_ERR_OK(status)) {
 			errno = EACCES;
 			return -1;