svn commit: samba r19501 - in branches/SAMBA_4_0/source/librpc/rpc: .

[tridge at samba.org]

Author: tridge
Date: 2006-10-27 01:10:49 +0000 (Fri, 27 Oct 2006)
New Revision: 19501

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19501

Log:

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 :)

Modified:
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2006-10-26 20:14:59 UTC (rev 19500)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2006-10-27 01:10:49 UTC (rev 19501)
@@ -426,19 +426,12 @@
 		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);
-
+		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;
 		}
-		memcpy(blob->data + blob->length - c->security_state.auth_info->credentials.length,
-		       creds2.data, creds2.length);
-
-		if (!NT_STATUS_IS_OK(status)) {
-			return status;
-		}
 		dcerpc_set_auth_length(blob, creds2.length);
 		break;
 
@@ -454,19 +447,12 @@
 		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);
-
+		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;
 		}
-		memcpy(blob->data + blob->length - c->security_state.auth_info->credentials.length,
-		       creds2.data, creds2.length);
-
-		if (!NT_STATUS_IS_OK(status)) {
-			return status;
-		}
 		dcerpc_set_auth_length(blob, creds2.length);
 		break;