diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-07 15:07:49 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:54 -0500 |
| commit | 71921605995fa95d84301534760a6bc2db3fa74b (patch) | |
| tree | 58676f522882b36e188e2e689b10d6e63f447037 /source3/libsmb | |
| parent | b1e866c3b7c2ef92599b5801ac8c174cfd404319 (diff) | |
| download | samba-71921605995fa95d84301534760a6bc2db3fa74b.tar.gz samba-71921605995fa95d84301534760a6bc2db3fa74b.tar.xz samba-71921605995fa95d84301534760a6bc2db3fa74b.zip | |
r22747: Fix some C++ warnings
(This used to be commit a66a04e9f11f6c4462f2b56b447bae4eca7b177c)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clikrb5.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/smb_seal.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 64cfe6e952c..a668d3b55cb 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -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; } diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c index dde69570ab5..81c6ff1bac2 100644 --- a/source3/libsmb/smb_seal.c +++ b/source3/libsmb/smb_seal.c @@ -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; |