2 files changed, 53 insertions, 1 deletions

diff --git a/source4/libcli/rpc/dcerpc.c b/source4/libcli/rpc/dcerpc.c
index 96a355c9e1..b620718755 100644
--- a/source4/libcli/rpc/dcerpc.c
+++ b/source4/libcli/rpc/dcerpc.c
@@ -199,7 +199,7 @@ static NTSTATUS dcerpc_pull_response(DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
 	stub_len = blob->length - ((*offset) + hdr->auth_length);
 	BLOB_CHECK_BOUNDS(blob, *offset, stub_len);
 	pkt->stub_data = data_blob_talloc(mem_ctx, blob->data + (*offset), stub_len);
-	if (!pkt->stub_data.data) {
+	if (stub_len != 0 && !pkt->stub_data.data) {
 		return NT_STATUS_NO_MEMORY;
 	}
 	(*offset) += stub_len;
diff --git a/source4/libcli/rpc/rpc_echo.c b/source4/libcli/rpc/rpc_echo.c
index ab793a1ffa..d73f9bda9c 100644
--- a/source4/libcli/rpc/rpc_echo.c
+++ b/source4/libcli/rpc/rpc_echo.c
@@ -83,3 +83,55 @@ NTSTATUS dcerpc_rpcecho_echodata(struct dcerpc_pipe *p,
 
 	return status;
 }
+
+/*
+  sourcedata interface
+*/
+NTSTATUS dcerpc_rpcecho_sourcedata(struct dcerpc_pipe *p,
+				 TALLOC_CTX *mem_ctx,
+				 int len,
+				 int *out_len,
+				 char **out_data)
+{
+	struct rpcecho_sourcedata r;
+	NTSTATUS status;
+
+	/* fill the .in side of the call */
+	r.in.len  = len;
+
+	/* make the call */
+	status = dcerpc_ndr_request(p, RPCECHO_CALL_SOURCEDATA, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_rpcecho_sourcedata,
+				    (ndr_pull_fn_t) ndr_pull_rpcecho_sourcedata,
+				    &r);
+
+	/* and extract the .out parameters */
+	*out_len = r.out.len;
+	*out_data = r.out.data;
+
+	return status;
+}
+
+/*
+  sinkdata interface
+*/
+NTSTATUS dcerpc_rpcecho_sinkdata(struct dcerpc_pipe *p,
+				 TALLOC_CTX *mem_ctx,
+				 int len,
+				 char *data)
+{
+	struct rpcecho_sinkdata r;
+	NTSTATUS status;
+
+	/* fill the .in side of the call */
+	r.in.len  = len;
+	r.in.data = data;
+
+	/* make the call */
+	status = dcerpc_ndr_request(p, RPCECHO_CALL_SINKDATA, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_rpcecho_sinkdata,
+				    (ndr_pull_fn_t) ndr_pull_rpcecho_sinkdata,
+				    &r);
+
+	return status;
+}