diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-07-18 12:28:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:28:49 -0500 |
| commit | f5033a1e625f74c517751bdb13f12f625ad34eb4 (patch) | |
| tree | 68929ade640ff565ce4bebd282fd2b3d54e5d337 | |
| parent | 21a847473da54b6e4b41a94f781a2935f482ebaa (diff) | |
| download | samba-f5033a1e625f74c517751bdb13f12f625ad34eb4.tar.gz samba-f5033a1e625f74c517751bdb13f12f625ad34eb4.tar.bz2 samba-f5033a1e625f74c517751bdb13f12f625ad34eb4.zip | |
r23953: Some C++ warnings
(This used to be commit 8716edf157bf8866328f82eb6cf25e71af7fea15)
| -rw-r--r-- | source3/libads/sasl.c | 9 | ||||
| -rw-r--r-- | source3/libads/sasl_wrapping.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c index f423464a07..a3636ec2be 100644 --- a/source3/libads/sasl.c +++ b/source3/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/source3/libads/sasl_wrapping.c b/source3/libads/sasl_wrapping.c index 931273f40c..c620aae7ac 100644 --- a/source3/libads/sasl_wrapping.c +++ b/source3/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; |