sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-23 20:23:50 +03:00
Code Activity

r22747: Fix some C++ warnings

Browse Source
This commit is contained in:
Volker Lendecke
2007-05-07 15:07:49 +00:00
committed by Gerald (Jerry) Carter
parent a99ab3a2ed
commit a66a04e9f1
8 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/libsmb/clikrb5.c
View File

@@ -1450,7 +1450,7 @@ done:
*opt = NULL;
if ((my_opt = SMB_MALLOC(sizeof(krb5_get_init_creds_opt))) == NULL) {
if ((my_opt = SMB_MALLOC_P(krb5_get_init_creds_opt)) == NULL) {
return ENOMEM;
}

6
source/libsmb/smb_seal.c
View File

@@ -72,7 +72,7 @@ NTSTATUS common_ntlm_decrypt_buffer(NTLMSSP_STATE *ntlmssp_state, char *buf)
return NT_STATUS_BUFFER_TOO_SMALL;
}
inbuf = smb_xmemdup(buf, buf_len);
inbuf = (char *)smb_xmemdup(buf, buf_len);
/* Adjust for the signature. */
data_len = buf_len - 8 - NTLMSSP_SIG_SIZE;
@@ -204,7 +204,7 @@ static NTSTATUS common_gss_decrypt_buffer(struct smb_tran_enc_state_gss *gss_sta
}
memcpy(buf + 8, out_buf.value, out_buf.length);
smb_setlen(out_buf.value, buf, out_buf.length + 4);
smb_setlen((char *)out_buf.value, buf, out_buf.length + 4);
gss_release_buffer(&minor, &out_buf);
return NT_STATUS_OK;
@@ -269,7 +269,7 @@ static NTSTATUS common_gss_encrypt_buffer(struct smb_tran_enc_state_gss *gss_sta
* bother :-*(. JRA.
*/
*ppbuf_out = SMB_MALLOC(out_buf.length + 8); /* We know this can't wrap. */
*ppbuf_out = (char *)SMB_MALLOC(out_buf.length + 8); /* We know this can't wrap. */
if (!*ppbuf_out) {
gss_release_buffer(&minor, &out_buf);
return NT_STATUS_NO_MEMORY;