mirror of
https://github.com/samba-team/samba.git
synced 2025-03-11 16:58:40 +03:00
r23953: Some C++ warnings
(This used to be commit 8716edf157bf8866328f82eb6cf25e71af7fea15)
This commit is contained in:
parent
21a847473d
commit
f5033a1e62
@ -23,7 +23,8 @@
|
|||||||
|
|
||||||
static ADS_STATUS ads_sasl_ntlmssp_wrap(ADS_STRUCT *ads, uint8 *buf, uint32 len)
|
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;
|
ADS_STATUS status;
|
||||||
NTSTATUS nt_status;
|
NTSTATUS nt_status;
|
||||||
DATA_BLOB sig;
|
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)
|
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;
|
ADS_STATUS status;
|
||||||
NTSTATUS nt_status;
|
NTSTATUS nt_status;
|
||||||
DATA_BLOB sig;
|
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)
|
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);
|
ntlmssp_end(&ntlmssp_state);
|
||||||
|
|
||||||
|
@ -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);
|
ret = ads_saslwrap_prepare_outbuf(ads, rlen);
|
||||||
if (ret < 0) return ret;
|
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)) {
|
if (!ADS_ERR_OK(status)) {
|
||||||
errno = EACCES;
|
errno = EACCES;
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user