diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-08 09:53:08 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-11-26 11:40:25 +0100 |
| commit | 5a7f01934851e325ad8cd0c1cd46d319d4b3d9a5 (patch) | |
| tree | 56b87e2a2d47c0f0eb82956b122bc1f4884555a0 /source3/include | |
| parent | fc9919b570d53e30935ad114e0365530f852186c (diff) | |
| download | samba-5a7f01934851e325ad8cd0c1cd46d319d4b3d9a5.tar.gz | |
s3: Do not reference ndr_table_<pipe> in the cli_ routines directly
(cherry picked from commit f76d06c94c47413ef60891a0f44c69303ee129cf)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/client.h | 4 | ||||
| -rw-r--r-- | source3/include/proto.h | 16 |
2 files changed, 13 insertions, 7 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 82d94b055f6..3b3931bb6bb 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 c4a8b411c33..3154c4b6442 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 */ |