summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-10-27 01:10:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:39 -0500
commitb4a5794e0983d41beec38ddc8430e04833af5915 (patch)
treeb34edfe1bfde4e661203f64b8813373a4fd6b9a1 /source4
parent5438fc6c6288f092f58932b44fa25cc517972517 (diff)
downloadsamba-b4a5794e0983d41beec38ddc8430e04833af5915.tar.gz
samba-b4a5794e0983d41beec38ddc8430e04833af5915.tar.bz2
samba-b4a5794e0983d41beec38ddc8430e04833af5915.zip
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)
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/rpc/dcerpc.c26
1 files changed, 6 insertions, 20 deletions
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;
}