From 86bb7464066ff3743eb19e874ef7dfe86dd1fcb4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 21 Jul 2008 12:50:32 +0200 Subject: Refactoring: CLI_DO_RPC_* uses interface instead of pipe_idx (This used to be commit 6d2209ba5da0937ce17e71951a1628ff1f5deacb) --- source3/include/rpc_client.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/include/rpc_client.h') diff --git a/source3/include/rpc_client.h b/source3/include/rpc_client.h index 466370ef7a..d1af6f958d 100644 --- a/source3/include/rpc_client.h +++ b/source3/include/rpc_client.h @@ -42,10 +42,10 @@ /* macro to expand cookie-cutter code in cli_xxx() using rpc_api_pipe_req() */ -#define CLI_DO_RPC_INTERNAL( pcli, ctx, p_idx, opnum, q_in, r_out, \ +#define CLI_DO_RPC_INTERNAL( pcli, ctx, interface, opnum, q_in, r_out, \ q_ps, r_ps, q_io_fn, r_io_fn, default_error, copy_sess_key ) \ {\ - SMB_ASSERT(pcli->pipe_idx == p_idx); \ + SMB_ASSERT(ndr_syntax_id_equal(&pcli->abstract_syntax, interface)); \ if (!prs_init( &q_ps, RPC_MAX_PDU_FRAG_LEN, ctx, MARSHALL )) { \ return NT_STATUS_NO_MEMORY;\ }\ @@ -90,10 +90,10 @@ /* Arrrgg. Same but with WERRORS. Needed for registry code. */ -#define CLI_DO_RPC_WERR( pcli, ctx, p_idx, opnum, q_in, r_out, \ +#define CLI_DO_RPC_WERR( pcli, ctx, interface, opnum, q_in, r_out, \ q_ps, r_ps, q_io_fn, r_io_fn, default_error ) \ {\ - SMB_ASSERT(rpccli_is_pipe_idx(pcli, p_idx)); \ + SMB_ASSERT(ndr_syntax_id_equal(&pcli->abstract_syntax, interface)); \ if (!prs_init( &q_ps, RPC_MAX_PDU_FRAG_LEN, ctx, MARSHALL )) { \ return WERR_NOMEM;\ }\ -- cgit