summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-08 09:53:08 +0100
committerVolker Lendecke <vl@samba.org>2009-11-08 13:12:13 +0100
commitdaa964013bc5d036f4da571ce22c0052ef40943a (patch)
treefa94d2690f3b5f334f823ec266bb6aa1023b324d /source3/include
parent70c698fd547c4bc19cf77693608bbb34acac40b5 (diff)
downloadsamba-daa964013bc5d036f4da571ce22c0052ef40943a.tar.gz
samba-daa964013bc5d036f4da571ce22c0052ef40943a.tar.bz2
samba-daa964013bc5d036f4da571ce22c0052ef40943a.zip
s3: Do not reference ndr_table_<pipe> in the cli_ routines directly
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/client.h4
-rw-r--r--source3/include/proto.h16
2 files changed, 13 insertions, 7 deletions
diff --git a/source3/include/client.h b/source3/include/client.h
index 82d94b055f..3b3931bb6b 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -123,14 +123,14 @@ struct rpc_pipe_client {
NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
- const struct ndr_interface_table *table,
+ const char *interface, uint32_t interface_version,
uint32_t opnum, void *r);
struct tevent_req *(*dispatch_send)(
TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct rpc_pipe_client *cli,
- const struct ndr_interface_table *table,
+ const char *interface, uint32_t interface_version,
uint32_t opnum,
void *r);
NTSTATUS (*dispatch_recv)(struct tevent_req *req,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2364360d4f..a0355732e7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5310,8 +5310,13 @@ NTSTATUS rpc_pipe_open_tcp(TALLOC_CTX *mem_ctx, const char *host,
NTSTATUS rpc_pipe_open_ncalrpc(TALLOC_CTX *mem_ctx, const char *socket_path,
const struct ndr_syntax_id *abstract_syntax,
struct rpc_pipe_client **presult);
-NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx, const struct ndr_syntax_id *abstract_syntax,
- NTSTATUS (*dispatch) (struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const struct ndr_interface_table *table, uint32_t opnum, void *r),
+NTSTATUS rpc_pipe_open_internal(TALLOC_CTX *mem_ctx,
+ const struct ndr_syntax_id *abstract_syntax,
+ NTSTATUS (*dispatch) (struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ const char *interface,
+ uint32_t interface_version,
+ uint32_t opnum, void *r),
struct auth_serversupplied_info *serversupplied_info,
struct rpc_pipe_client **presult);
NTSTATUS cli_rpc_pipe_open_noauth(struct cli_state *cli,
@@ -5634,14 +5639,15 @@ void init_samr_CryptPassword(const char *pwd,
struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct rpc_pipe_client *cli,
- const struct ndr_interface_table *table,
+ const char *interface,
+ uint32_t interface_version,
uint32_t opnum,
void *r);
NTSTATUS cli_do_rpc_ndr_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx);
NTSTATUS cli_do_rpc_ndr(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
- const struct ndr_interface_table *table,
- uint32 opnum, void *r);
+ const char *interface, uint32_t interface_version,
+ uint32_t opnum, void *r);
/* The following definitions come from rpc_parse/parse_misc.c */