From: Volker Lendecke <vlendec@samba.org>
Date: Wed, 18 Jul 2007 12:28:32 +0000 (+0000)
Subject: r23953: Some C++ warnings
X-Git-Tag: samba-misc-tags/initial-v3-2-unstable~667
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8716edf157bf8866328f82eb6cf25e71af7fea15;p=thirdparty%2Fsamba.git

r23953: Some C++ warnings
---

diff --git a/source/libads/sasl.c b/source/libads/sasl.c
index f423464a07e..a3636ec2beb 100644
--- a/source/libads/sasl.c
+++ b/source/libads/sasl.c
@@ -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_wrap(ADS_STRUCT *ads, uint8 *buf, uint32 len)
 
 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 ADS_STATUS ads_sasl_ntlmssp_unwrap(ADS_STRUCT *ads)
 
 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);
 
diff --git a/source/libads/sasl_wrapping.c b/source/libads/sasl_wrapping.c
index 931273f40c0..c620aae7ac3 100644
--- a/source/libads/sasl_wrapping.c
+++ b/source/libads/sasl_wrapping.c
@@ -213,7 +213,7 @@ static ber_slen_t ads_saslwrap_write(Sockbuf_IO_Desc *sbiod, void *buf, ber_len_
 		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;