mirror of
https://github.com/samba-team/samba.git
synced 2025-11-11 00:23:51 +03:00
r22747: Fix some C++ warnings
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
a99ab3a2ed
commit
a66a04e9f1
@@ -492,8 +492,7 @@ static NTSTATUS srv_enc_spnego_negotiate(connection_struct *conn,
|
||||
|
||||
if (NT_STATUS_IS_OK(status)) {
|
||||
/* Return the context we're using for this encryption state. */
|
||||
*pparam = SMB_MALLOC(2);
|
||||
if (!*pparam) {
|
||||
if (!(*pparam = SMB_MALLOC_ARRAY(unsigned char, 2))) {
|
||||
return NT_STATUS_NO_MEMORY;
|
||||
}
|
||||
SSVAL(*pparam,0,partial_srv_trans_enc_ctx->es->enc_ctx_num);
|
||||
@@ -542,8 +541,7 @@ static NTSTATUS srv_enc_spnego_ntlm_auth(connection_struct *conn,
|
||||
|
||||
if (NT_STATUS_IS_OK(status)) {
|
||||
/* Return the context we're using for this encryption state. */
|
||||
*pparam = SMB_MALLOC(2);
|
||||
if (!*pparam) {
|
||||
if (!(*pparam = SMB_MALLOC_ARRAY(unsigned char, 2))) {
|
||||
return NT_STATUS_NO_MEMORY;
|
||||
}
|
||||
SSVAL(*pparam,0,ec->es->enc_ctx_num);
|
||||
@@ -593,8 +591,7 @@ static NTSTATUS srv_enc_raw_ntlm_auth(connection_struct *conn,
|
||||
|
||||
if (NT_STATUS_IS_OK(status)) {
|
||||
/* Return the context we're using for this encryption state. */
|
||||
*pparam = SMB_MALLOC(2);
|
||||
if (!*pparam) {
|
||||
if (!(*pparam = SMB_MALLOC_ARRAY(unsigned char, 2))) {
|
||||
return NT_STATUS_NO_MEMORY;
|
||||
}
|
||||
SSVAL(*pparam,0,ec->es->enc_ctx_num);
|
||||
|
||||
Reference in New Issue
Block a user