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)

1 files changed, 22 insertions, 22 deletions

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 */