Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel

(This used to be commit 8e4dca3b9416d9b5e535bda5e4befc073bfc1641)

1 files changed, 17 insertions, 9 deletions

diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c
index 072132f5ac..b3deb80c5d 100644
--- a/source3/rpc_parse/parse_prs.c
+++ b/source3/rpc_parse/parse_prs.c
@@ -395,18 +395,26 @@ bool prs_append_prs_data(prs_struct *dst, prs_struct *src)
  Append some data from one parse_struct into another.
  ********************************************************************/
 
-bool prs_append_some_prs_data(prs_struct *dst, prs_struct *src, int32 start, uint32 len)
-{	
-	if (len == 0)
-		return True;
+bool prs_append_some_data(prs_struct *dst, void *src_base, uint32_t start,
+			  uint32_t len)
+{
+	if (len == 0) {
+		return true;
+	}
 
-	if(!prs_grow(dst, len))
-		return False;
-	
-	memcpy(&dst->data_p[dst->data_offset], src->data_p + start, (size_t)len);
+	if(!prs_grow(dst, len)) {
+		return false;
+	}
+
+	memcpy(&dst->data_p[dst->data_offset], src_base + start, (size_t)len);
 	dst->data_offset += len;
+	return true;
+}
 
-	return True;
+bool prs_append_some_prs_data(prs_struct *dst, prs_struct *src, int32 start,
+			      uint32 len)
+{
+	return prs_append_some_data(dst, src->data_p, start, len);
 }
 
 /*******************************************************************