Ok - this is a *BIG* change - but it fixes the problems with static strings

in the RPC code. This change was prompted by trying to save a long (>256)
character comment in the printer properties page.

The new system associates a TALLOC_CTX with the pipe struct, and frees
the pool on return of a complete PDU.

A global TALLOC_CTX is used for the odd buffer allocated in the BUFFERxx
code, and is freed in the main loop.

This code works with insure, and seems to be free of memory leaks and
crashes (so far) but there are probably the occasional problem with
code that uses UNISTRxx structs on the stack and expects them to contain
storage without doing a init_unistrXX().

This means that rpcclient will probably be horribly broken.
A TALLOC_CTX also needed associating with the struct cli_state also,
to make the prs_xx code there work.

The main interface change is the addition of a TALLOC_CTX to the
prs_init calls - used for dynamic allocation in the prs_XXX calls.

Now this is in place it should make dynamic allocation of all RPC
memory on unmarshall *much* easier to fix.

Jeremy.
(This used to be commit 0ff2ce543ee54f7364e6d839db6d06e7ef1edcf4)

7 files changed, 95 insertions, 95 deletions

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 239d38c358..a9b9eddfb8 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -50,8 +50,8 @@ BOOL do_lsa_open_policy(struct cli_state *cli,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL );
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL );
 
 	/* create and send a MSRPC command with api LSA_OPENPOLICY */
 
@@ -125,8 +125,8 @@ BOOL do_lsa_lookup_sids(struct cli_state *cli,
 	if (hnd == NULL || num_sids == 0 || sids == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL );
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL );
 
 	/* create and send a MSRPC command with api LSA_LOOKUP_SIDS */
 
@@ -229,8 +229,8 @@ BOOL do_lsa_query_info_pol(struct cli_state *cli,
 	if (hnd == NULL || domain_name == NULL || domain_sid == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL );
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL );
 
 	/* create and send a MSRPC command with api LSA_QUERYINFOPOLICY */
 
@@ -329,8 +329,8 @@ BOOL do_lsa_close(struct cli_state *cli, POLICY_HND *hnd)
 
 	/* create and send a MSRPC command with api LSA_OPENPOLICY */
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL );
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL );
 
 	DEBUG(4,("LSA Close\n"));
 
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 6437685ed8..63461c5023 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -64,8 +64,8 @@ BOOL cli_net_logon_ctrl2(struct cli_state *cli, uint32 status_level)
   NET_Q_LOGON_CTRL2 q_l;
   BOOL ok = False;
 
-  prs_init(&buf , 1024, 4, False);
-  prs_init(&rbuf, 0,    4, True );
+  prs_init(&buf , 1024, 4, cli->mem_ctx, False);
+  prs_init(&rbuf, 0,    4, cli->mem_ctx, True );
 
   /* create and send a MSRPC command with api NET_LOGON_CTRL2 */
 
@@ -125,8 +125,8 @@ BOOL cli_net_auth2(struct cli_state *cli, uint16 sec_chan,
   NET_Q_AUTH_2 q_a;
   BOOL ok = False;
 
-  prs_init(&buf , 1024, 4, False);
-  prs_init(&rbuf, 0,    4, True );
+  prs_init(&buf , 1024, 4, cli->mem_ctx, False);
+  prs_init(&rbuf, 0,    4, cli->mem_ctx, True );
 
   /* create and send a MSRPC command with api NET_AUTH2 */
 
@@ -215,8 +215,8 @@ BOOL cli_net_req_chal(struct cli_state *cli, DOM_CHAL *clnt_chal, DOM_CHAL *srv_
   NET_Q_REQ_CHAL q_c;
   BOOL valid_chal = False;
 
-  prs_init(&buf , 1024, 4, False);
-  prs_init(&rbuf, 0,    4, True );
+  prs_init(&buf , 1024, 4, cli->mem_ctx, False);
+  prs_init(&rbuf, 0,    4, cli->mem_ctx, True );
 
   /* create and send a MSRPC command with api NET_REQCHAL */
 
@@ -279,8 +279,8 @@ BOOL cli_net_srv_pwset(struct cli_state *cli, uint8 hashed_mach_pwd[16])
 
   gen_next_creds( cli, &new_clnt_cred);
 
-  prs_init(&buf , 1024, 4, False);
-  prs_init(&rbuf, 0,    4, True );
+  prs_init(&buf , 1024, 4, cli->mem_ctx, False);
+  prs_init(&rbuf, 0,    4, cli->mem_ctx, True );
 
   /* create and send a MSRPC command with api NET_SRV_PWSET */
 
@@ -350,8 +350,8 @@ BOOL cli_net_sam_logon(struct cli_state *cli, NET_ID_INFO_CTR *ctr,
 
   gen_next_creds( cli, &new_clnt_cred);
 
-  prs_init(&buf , 1024, 4, False);
-  prs_init(&rbuf, 0,    4, True );
+  prs_init(&buf , 1024, 4, cli->mem_ctx, False);
+  prs_init(&rbuf, 0,    4, cli->mem_ctx, True );
 
   /* create and send a MSRPC command with api NET_SAMLOGON */
 
@@ -439,8 +439,8 @@ BOOL cli_net_sam_logoff(struct cli_state *cli, NET_ID_INFO_CTR *ctr)
 
   gen_next_creds( cli, &new_clnt_cred);
 
-  prs_init(&buf , 1024, 4, False);
-  prs_init(&rbuf, 0,    4, True );
+  prs_init(&buf , 1024, 4, cli->mem_ctx, False);
+  prs_init(&rbuf, 0,    4, cli->mem_ctx, True );
 
   /* create and send a MSRPC command with api NET_SAMLOGOFF */
 
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index ade31dbb5b..8136b7894c 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -223,7 +223,7 @@ static BOOL rpc_auth_pipe(struct cli_state *cli, prs_struct *rdata, int len, int
 
 		memcpy(data, dp, sizeof(data));
 		
-		prs_init(&auth_req , 0, 4, UNMARSHALL);
+		prs_init(&auth_req , 0, 4, cli->mem_ctx, UNMARSHALL);
 		prs_give_memory(&auth_req, data, RPC_HDR_AUTH_LEN, False);
 
 		/*
@@ -267,7 +267,7 @@ static BOOL rpc_auth_pipe(struct cli_state *cli, prs_struct *rdata, int len, int
 		memcpy(data, dp, RPC_AUTH_NTLMSSP_CHK_LEN);
 		dump_data(100, data, auth_len);
 
-		prs_init(&auth_verf, 0, 4, UNMARSHALL);
+		prs_init(&auth_verf, 0, 4, cli->mem_ctx, UNMARSHALL);
 		prs_give_memory(&auth_verf, data, RPC_AUTH_NTLMSSP_CHK_LEN, False);
 
 		if(!smb_io_rpc_auth_ntlmssp_chk("auth_sign", &chk, &auth_verf, 0)) {
@@ -446,7 +446,7 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd, prs_struct *data, pr
 		 * First read the header of the next PDU.
 		 */
 
-		prs_init(&hps, 0, 4, UNMARSHALL);
+		prs_init(&hps, 0, 4, cli->mem_ctx, UNMARSHALL);
 		prs_give_memory(&hps, hdr_data, sizeof(hdr_data), False);
 
 		num_read = cli_read(cli, cli->nt_pipe_fnum, hdr_data, 0, RPC_HEADER_LEN+RPC_HDR_RESP_LEN);
@@ -522,7 +522,7 @@ static BOOL create_rpc_bind_req(prs_struct *rpc_out, BOOL do_auth, uint32 rpc_ca
 	prs_struct auth_info;
 	int auth_len = 0;
 
-	prs_init(&auth_info, 0, 4, MARSHALL);
+	prs_init(&auth_info, 0, 4, prs_get_mem_context(rpc_out), MARSHALL);
 
 	if (do_auth) {
 		RPC_HDR_AUTH hdr_auth;
@@ -626,7 +626,7 @@ static BOOL create_rpc_bind_resp(struct pwd_info *pwd,
 	 * Marshall the variable length data into a temporary parse
 	 * struct, pointing into a 4k local buffer.
 	 */
-        prs_init(&auth_info, 0, 4, MARSHALL);
+        prs_init(&auth_info, 0, 4, prs_get_mem_context(rpc_out), MARSHALL);
 
 	/*
 	 * Use the 4k buffer to store the auth info.
@@ -784,7 +784,7 @@ BOOL rpc_api_pipe_req(struct cli_state *cli, uint8 op_num,
 	 * Malloc a parse struct to hold it (and enough for alignments).
 	 */
 
-	if(!prs_init(&outgoing_packet, data_len + 8, 4, MARSHALL)) {
+	if(!prs_init(&outgoing_packet, data_len + 8, 4, cli->mem_ctx, MARSHALL)) {
 		DEBUG(0,("rpc_api_pipe_req: Failed to malloc %u bytes.\n", (unsigned int)data_len ));
 		return False;
 	}
@@ -1022,7 +1022,7 @@ static BOOL rpc_send_auth_reply(struct cli_state *cli, prs_struct *rdata, uint32
 
 	pwd_make_lm_nt_owf(&cli->pwd, rhdr_chal.challenge);
 
-	prs_init(&rpc_out, 0, 4, MARSHALL);
+	prs_init(&rpc_out, 0, 4, cli->mem_ctx, MARSHALL);
 
 	prs_give_memory( &rpc_out, buffer, sizeof(buffer), False);
 
@@ -1094,7 +1094,7 @@ BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name, char *my_name)
 	if (!valid_pipe_name(pipe_name, &abstract, &transfer))
 		return False;
 
-	prs_init(&rpc_out, 0, 4, MARSHALL);
+	prs_init(&rpc_out, 0, 4, cli->mem_ctx, MARSHALL);
 
 	/*
 	 * Use the MAX_PDU_FRAG_LEN buffer to store the bind request.
@@ -1110,7 +1110,7 @@ BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name, char *my_name)
 	                    global_myname, cli->domain, cli->ntlmssp_cli_flgs);
 
 	/* Initialize the incoming data struct. */
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* send data on \PIPE\.  receive a response */
 	if (rpc_api_pipe(cli, 0x0026, &rpc_out, &rdata)) {
diff --git a/source3/rpc_client/cli_reg.c b/source3/rpc_client/cli_reg.c
index d8b6931b42..13a9b26515 100644
--- a/source3/rpc_client/cli_reg.c
+++ b/source3/rpc_client/cli_reg.c
@@ -86,8 +86,8 @@ BOOL do_reg_open_hklm(struct cli_state *cli, uint16 unknown_0, uint32 level,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_OPEN_HKLM */
 
@@ -147,8 +147,8 @@ BOOL do_reg_open_hku(struct cli_state *cli, uint16 unknown_0, uint32 level,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_OPEN_HKU */
 
@@ -209,8 +209,8 @@ BOOL do_reg_flush_key(struct cli_state *cli, POLICY_HND *hnd)
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_FLUSH_KEY */
 
@@ -271,8 +271,8 @@ BOOL do_reg_query_key(struct cli_state *cli, POLICY_HND *hnd,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_QUERY_KEY */
 
@@ -339,8 +339,8 @@ BOOL do_reg_unknown_1a(struct cli_state *cli, POLICY_HND *hnd, uint32 *unk)
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_UNKNOWN_1A */
 
@@ -399,8 +399,8 @@ BOOL do_reg_query_info(struct cli_state *cli, POLICY_HND *hnd,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_INFO */
 
@@ -459,8 +459,8 @@ BOOL do_reg_set_key_sec(struct cli_state *cli, POLICY_HND *hnd, SEC_DESC_BUF *se
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_SET_KEY_SEC */
 
@@ -515,8 +515,8 @@ BOOL do_reg_get_key_sec(struct cli_state *cli, POLICY_HND *hnd, uint32 *sec_buf_
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_GET_KEY_SEC */
 
@@ -581,8 +581,8 @@ BOOL do_reg_delete_val(struct cli_state *cli, POLICY_HND *hnd, char *val_name)
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_DELETE_VALUE */
 
@@ -638,8 +638,8 @@ BOOL do_reg_delete_key(struct cli_state *cli, POLICY_HND *hnd, char *key_name)
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_DELETE_KEY */
 
@@ -722,8 +722,8 @@ BOOL do_reg_create_key(struct cli_state *cli, POLICY_HND *hnd,
 	}
 	free_sec_desc(&sec);
 
-	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	init_reg_q_create_key(&q_o, hnd, key_name, key_class, sam_access, sec_buf);
 
@@ -783,8 +783,8 @@ BOOL do_reg_enum_key(struct cli_state *cli, POLICY_HND *hnd,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_ENUM_KEY */
 
@@ -846,8 +846,8 @@ BOOL do_reg_create_val(struct cli_state *cli, POLICY_HND *hnd,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_CREATE_VALUE */
 
@@ -906,8 +906,8 @@ BOOL do_reg_enum_val(struct cli_state *cli, POLICY_HND *hnd,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_ENUM_VALUE */
 
@@ -969,8 +969,8 @@ BOOL do_reg_open_entry(struct cli_state *cli, POLICY_HND *hnd,
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api REG_OPEN_ENTRY */
 
@@ -1031,8 +1031,8 @@ BOOL do_reg_close(struct cli_state *cli, POLICY_HND *hnd)
 
 	/* create and send a MSRPC command with api REG_CLOSE */
 
-	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL);
+	prs_init(&buf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("REG Close\n"));
 
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 18c1decefd..521c42ce2c 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -113,8 +113,8 @@ BOOL do_samr_chgpasswd_user(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_CHGPASSWD_USER */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Change User Password. server:%s username:%s\n",
 	        srv_name, user_name));
@@ -169,8 +169,8 @@ BOOL do_samr_unknown_38(struct cli_state *cli, char *srv_name)
 
 	/* create and send a MSRPC command with api SAMR_ENUM_DOM_USERS */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Unknown 38 server:%s\n", srv_name));
 
@@ -225,8 +225,8 @@ BOOL do_samr_query_dom_info(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_ENUM_DOM_USERS */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Unknown 8 switch:%d\n", switch_value));
 
@@ -287,8 +287,8 @@ BOOL do_samr_enum_dom_users(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_ENUM_DOM_USERS */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Enum SAM DB max size:%x\n", size));
 
@@ -374,8 +374,8 @@ BOOL do_samr_connect(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_CONNECT */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Open Policy server:%s undoc value:%x\n",
 				srv_name, unknown_0));
@@ -435,8 +435,8 @@ BOOL do_samr_open_user(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_OPEN_USER */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Open User.  unk_0: %08x RID:%x\n",
 	          unk_0, rid));
@@ -497,8 +497,8 @@ BOOL do_samr_open_domain(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_OPEN_DOMAIN */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	sid_to_string(sid_str, sid);
 	DEBUG(4,("SAMR Open Domain.  SID:%s RID:%x\n", sid_str, rid));
@@ -561,8 +561,8 @@ BOOL do_samr_query_unknown_12(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_UNKNOWN_12 */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Query Unknown 12.\n"));
 
@@ -638,8 +638,8 @@ BOOL do_samr_query_usergroups(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_QUERY_USERGROUPS */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Query User Groups.\n"));
 
@@ -700,8 +700,8 @@ BOOL do_samr_query_userinfo(struct cli_state *cli,
 
 	/* create and send a MSRPC command with api SAMR_QUERY_USERINFO */
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	DEBUG(4,("SAMR Query User Info.  level: %d\n", switch_value));
 
@@ -770,8 +770,8 @@ BOOL do_samr_close(struct cli_state *cli, POLICY_HND *hnd)
 	if (hnd == NULL)
 		return False;
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4, cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api SAMR_CLOSE_HND */
 
diff --git a/source3/rpc_client/cli_srvsvc.c b/source3/rpc_client/cli_srvsvc.c
index b883cc1942..b6dc0aff4a 100644
--- a/source3/rpc_client/cli_srvsvc.c
+++ b/source3/rpc_client/cli_srvsvc.c
@@ -49,8 +49,8 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
 	if (server_name == NULL || ctr == NULL || preferred_len == 0)
 		return False;
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4,  cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4,  cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api SRV_NETCONNENUM */
 
@@ -129,8 +129,8 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
 	if (server_name == NULL || ctr == NULL || preferred_len == 0)
 		return False;
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4,  cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4,  cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api SRV_NETSESSENUM */
 
@@ -206,8 +206,8 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
 	if (server_name == NULL || preferred_len == 0)
 		return False;
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4,  cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4,  cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api SRV_NETSHAREENUM */
 
@@ -279,8 +279,8 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
 	if (server_name == NULL || ctr == NULL || preferred_len == 0)
 		return False;
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4,  cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4,  cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api SRV_NETFILEENUM */
 
@@ -357,8 +357,8 @@ BOOL do_srv_net_srv_get_info(struct cli_state *cli,
 	if (server_name == NULL || switch_value == 0 || ctr == NULL)
 		return False;
 
-	prs_init(&data , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rdata, 0, 4, UNMARSHALL);
+	prs_init(&data , MAX_PDU_FRAG_LEN, 4,  cli->mem_ctx, MARSHALL);
+	prs_init(&rdata, 0, 4,  cli->mem_ctx, UNMARSHALL);
 
 	/* create and send a MSRPC command with api SRV_NET_SRV_GET_INFO */
 
diff --git a/source3/rpc_client/cli_wkssvc.c b/source3/rpc_client/cli_wkssvc.c
index ae0d5d8231..16968b39e4 100644
--- a/source3/rpc_client/cli_wkssvc.c
+++ b/source3/rpc_client/cli_wkssvc.c
@@ -47,8 +47,8 @@ BOOL do_wks_query_info(struct cli_state *cli,
 	if (server_name == 0 || wks100 == NULL)
 		return False;
 
-	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, MARSHALL);
-	prs_init(&rbuf, 0, 4, UNMARSHALL );
+	prs_init(&buf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL );
 
 	/* create and send a MSRPC command with api WKS_QUERY_INFO */