From f56eedb95c64593ceff0ef91b99729c5071aa7ac Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 20 Apr 2008 11:45:41 +0200 Subject: Remove the pipe_idx variable from rpc_pipe_client (This used to be commit 4840febcd481563c3d9b2fabc1fe1b2ae5a76cf6) --- source3/include/client.h | 4 +++- source3/include/rpc_client.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'source3/include') diff --git a/source3/include/client.h b/source3/include/client.h index af03e2bb60..d9f4727203 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -62,10 +62,12 @@ struct rpc_pipe_client { struct cli_state *cli; - int pipe_idx; const char *pipe_name; uint16 fnum; + const struct ndr_syntax_id *abstract_syntax; + const struct ndr_syntax_id *transfer_syntax; + const char *desthost; const char *srv_name_slash; diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h index c552271ee7..ce0c932981 100644 --- a/source3/include/rpc_client.h +++ b/source3/include/rpc_client.h @@ -91,7 +91,7 @@ #define CLI_DO_RPC_WERR( pcli, ctx, p_idx, opnum, q_in, r_out, \ q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \ {\ - SMB_ASSERT(pcli->pipe_idx == p_idx); \ + SMB_ASSERT(rpccli_is_pipe_idx(pcli, p_idx)); \ if (!prs_init( &q_ps, RPC_MAX_PDU_FRAG_LEN, ctx, MARSHALL )) { \ return WERR_NOMEM;\ }\ -- cgit