From 0b91f3916430d0271eab867675d44c5439de40c2 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 29 Aug 2007 13:07:03 +0000 Subject: r24780: More work allowing libutil to be used by external users. (This used to be commit 31993cf67b816a184a4a4e92ef8ca2532c797190) --- source4/librpc/rpc/dcerpc.c | 14 ++++++-------- source4/librpc/rpc/dcerpc_smb2.c | 7 +++---- 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'source4/librpc/rpc') diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index ed9eb7da78..984cc20fbc 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -429,10 +429,9 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, return status; } blob->length -= c->security_state.auth_info->credentials.length; - status = data_blob_append(mem_ctx, blob, - creds2.data, creds2.length); - if (!NT_STATUS_IS_OK(status)) { - return status; + if (!data_blob_append(mem_ctx, blob, + creds2.data, creds2.length)) { + return NT_STATUS_NO_MEMORY; } dcerpc_set_auth_length(blob, creds2.length); if (c->security_state.auth_info->credentials.length == 0) { @@ -457,10 +456,9 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, return status; } blob->length -= c->security_state.auth_info->credentials.length; - status = data_blob_append(mem_ctx, blob, - creds2.data, creds2.length); - if (!NT_STATUS_IS_OK(status)) { - return status; + if (!data_blob_append(mem_ctx, blob, + creds2.data, creds2.length)) { + return NT_STATUS_NO_MEMORY; } dcerpc_set_auth_length(blob, creds2.length); if (c->security_state.auth_info->credentials.length == 0) { diff --git a/source4/librpc/rpc/dcerpc_smb2.c b/source4/librpc/rpc/dcerpc_smb2.c index 53f731f8b3..dcfee1f223 100644 --- a/source4/librpc/rpc/dcerpc_smb2.c +++ b/source4/librpc/rpc/dcerpc_smb2.c @@ -92,10 +92,9 @@ static void smb2_read_callback(struct smb2_request *req) return; } - status = data_blob_append(state, &state->data, - io.out.data.data, io.out.data.length); - if (NT_STATUS_IS_ERR(status)) { - pipe_dead(state->c, status); + if (!data_blob_append(state, &state->data, + io.out.data.data, io.out.data.length)) { + pipe_dead(state->c, NT_STATUS_NO_MEMORY); talloc_free(state); return; } -- cgit