2 files changed, 3 insertions, 62 deletions

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 2b65c67f15..6d1d56ee84 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -1150,63 +1150,6 @@ NTSTATUS cli_lsa_query_secobj(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 	return result;
 }
 
-
-/* Enumerate account rights This is similar to enum_privileges but
-   takes a SID directly, avoiding the open_account call.
-*/
-
-NTSTATUS cli_lsa_enum_account_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-				     POLICY_HND *pol, DOM_SID sid,
-				     uint32 *count, char ***privs_name)
-{
-	prs_struct qbuf, rbuf;
-	LSA_Q_ENUM_ACCT_RIGHTS q;
-	LSA_R_ENUM_ACCT_RIGHTS r;
-	NTSTATUS result;
-	int i;
-
-	ZERO_STRUCT(q);
-	ZERO_STRUCT(r);
-
-	/* Initialise parse structures */
-
-	prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
-	prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
-
-	/* Marshall data and send request */
-	init_q_enum_acct_rights(&q, pol, 2, &sid);
-
-	if (!lsa_io_q_enum_acct_rights("", &q, &qbuf, 0) ||
-	    !rpc_api_pipe_req(cli, LSA_ENUMACCTRIGHTS, &qbuf, &rbuf)) {
-		result = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
-
-	if (!lsa_io_r_enum_acct_rights("", &r, &rbuf, 0)) {
-		result = NT_STATUS_UNSUCCESSFUL;
-		goto done;
-	}
-
-	if (!NT_STATUS_IS_OK(result = r.status)) {
-		goto done;
-	}
-
-	*count = r.count;
-	if (! *count) {
-		goto done;
-	}
-
-	*privs_name = (char **)talloc(mem_ctx, (*count) * sizeof(char **));
-	for (i=0;i<*count;i++) {
-		pull_ucs2_talloc(mem_ctx, &(*privs_name)[i], r.rights.strings[i].string.buffer);
-	}
-
-done:
-
-	return result;
-}
-
-
 #if 0
 
 /** An example of how to use the routines in this file.  Fetch a DOMAIN
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index a241744466..ac43d8994c 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -862,9 +862,10 @@ BOOL rpc_api_pipe_req(struct cli_state *cli, uint8 op_num,
 			return False;
 		}
 
-		if (data_left == prs_offset(data))
+		if (data_left == prs_offset(data)) {
 			flags |= RPC_FLG_FIRST;
-
+			callid = 0;
+		}
 		if (data_left < max_data)
 			flags |= RPC_FLG_LAST;
 		/*
@@ -1283,9 +1284,6 @@ BOOL cli_nt_session_open(struct cli_state *cli, const int pipe_idx)
 {
 	int fnum;
 
-	/* At the moment we can't have more than one pipe open over
-           a cli connection. )-: */
-
 	SMB_ASSERT(cli->nt_pipe_fnum == 0);
 	
 	/* The pipe index must fall within our array */