Missed some prs_inits.

Jeremy.
(This used to be commit 7a8a7a24d4c328d26d34c3b3ac28af39e6acd32c)

2 files changed, 29 insertions, 29 deletions

diff --git a/source3/libsmb/cli_samr.c b/source3/libsmb/cli_samr.c
index 22ef324d63..d4540b15c5 100644
--- a/source3/libsmb/cli_samr.c
+++ b/source3/libsmb/cli_samr.c
@@ -98,8 +98,8 @@ uint32 cli_samr_connect(struct cli_state *cli, char *srv_name,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -145,8 +145,8 @@ uint32 cli_samr_close(struct cli_state *cli, POLICY_HND *connect_pol)
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -194,8 +194,8 @@ uint32 cli_samr_open_domain(struct cli_state *cli, POLICY_HND *connect_pol,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -243,8 +243,8 @@ uint32 cli_samr_open_user(struct cli_state *cli, POLICY_HND *domain_pol,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -292,8 +292,8 @@ uint32 cli_samr_open_group(struct cli_state *cli, POLICY_HND *domain_pol,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -340,8 +340,8 @@ uint32 cli_samr_query_userinfo(struct cli_state *cli, POLICY_HND *user_pol,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -388,8 +388,8 @@ uint32 cli_samr_query_groupinfo(struct cli_state *cli, POLICY_HND *group_pol,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -436,8 +436,8 @@ uint32 cli_samr_query_usergroups(struct cli_state *cli, POLICY_HND *user_pol,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
@@ -485,8 +485,8 @@ uint32 cli_samr_query_groupmem(struct cli_state *cli, POLICY_HND *group_pol,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Marshall data and send request */
 
diff --git a/source3/libsmb/cli_spoolss.c b/source3/libsmb/cli_spoolss.c
index 2dbc1a0ab0..d8e7b0cce6 100644
--- a/source3/libsmb/cli_spoolss.c
+++ b/source3/libsmb/cli_spoolss.c
@@ -99,8 +99,8 @@ uint32 cli_spoolss_open_printer_ex(struct cli_state *cli, char *printername,
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Initialise input parameters */
 
@@ -149,8 +149,8 @@ uint32 cli_spoolss_closeprinter(struct cli_state *cli, POLICY_HND *pol)
 
 	/* Initialise parse structures */
 
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, False);
-	prs_init(&rbuf, 0, 4, cli->mem_ctx, True);
+	prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+	prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 	/* Initialise input parameters */
 
@@ -191,7 +191,7 @@ static void init_buffer(NEW_BUFFER *buffer, uint32 size, TALLOC_CTX *ctx)
 	buffer->ptr = (size != 0);
 	buffer->size = size;
 	buffer->string_at_end = size;
-	prs_init(&buffer->prs, size, 4, ctx, MARSHALL);
+	prs_init(&buffer->prs, size, ctx, MARSHALL);
 	buffer->struct_start = prs_offset(&buffer->prs);
 }
 
@@ -330,8 +330,8 @@ uint32 cli_spoolss_enum_printers(struct cli_state *cli, uint32 flags,
 
 		init_buffer(&buffer, needed, cli->mem_ctx);
 
-		prs_init(&qbuf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
-		prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
+		prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+		prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 		make_spoolss_q_enumprinters(&q, flags, "", level, &buffer, 
 					    needed);
@@ -407,8 +407,8 @@ uint32 cli_spoolss_enum_ports(struct cli_state *cli, uint32 level,
 
 		init_buffer(&buffer, needed, cli->mem_ctx);
 
-		prs_init(&qbuf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
-		prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
+		prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+		prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 		make_spoolss_q_enumports(&q, "", level, &buffer, needed);
 
@@ -479,8 +479,8 @@ uint32 cli_spoolss_getprinter(struct cli_state *cli, POLICY_HND *pol,
 
 		init_buffer(&buffer, needed, cli->mem_ctx);
 
-		prs_init(&qbuf , MAX_PDU_FRAG_LEN, 4, cli->mem_ctx, MARSHALL);
-		prs_init(&rbuf, 0, 4, cli->mem_ctx, UNMARSHALL);
+		prs_init(&qbuf, MAX_PDU_FRAG_LEN, cli->mem_ctx, MARSHALL);
+		prs_init(&rbuf, 0, cli->mem_ctx, UNMARSHALL);
 
 		make_spoolss_q_getprinter(&q, pol, level, &buffer, 
 					  needed);