From b4a5794e0983d41beec38ddc8430e04833af5915 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 27 Oct 2006 01:10:49 +0000 Subject: r19501: fix the hangs in the build farm in RPC-SECRETS a RPC-SECRETS on kerberos test still fails, but I'll let andrew take a look at that later :) (This used to be commit c260b175682c1cd95eaba958bfd9f054cb2547ea) --- source4/librpc/rpc/dcerpc.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'source4/librpc/rpc/dcerpc.c') diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index e763c81f13..28e48c4a5a 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -426,16 +426,9 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, if (!NT_STATUS_IS_OK(status)) { return status; } - status = data_blob_realloc(mem_ctx, blob, - blob->length - c->security_state.auth_info->credentials.length + - creds2.length); - - if (!NT_STATUS_IS_OK(status)) { - return status; - } - memcpy(blob->data + blob->length - c->security_state.auth_info->credentials.length, - creds2.data, creds2.length); - + 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; } @@ -454,16 +447,9 @@ static NTSTATUS ncacn_push_request_sign(struct dcerpc_connection *c, if (!NT_STATUS_IS_OK(status)) { return status; } - status = data_blob_realloc(mem_ctx, blob, - blob->length - c->security_state.auth_info->credentials.length + - creds2.length); - - if (!NT_STATUS_IS_OK(status)) { - return status; - } - memcpy(blob->data + blob->length - c->security_state.auth_info->credentials.length, - creds2.data, creds2.length); - + 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; } -- cgit